diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 4c2de9249..f94c407b9 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -636,8 +636,8 @@ userTableQuery :: UserTableWhere -> UserTableExpr
                   , E.SqlExpr (E.Value UTCTime)
                   , E.SqlExpr (E.Value (Maybe CourseUserNoteId)))
 userTableQuery whereClause t@((user `E.InnerJoin` participant) `E.LeftOuterJoin` note) = do
-  E.on $ (E.just $ participant E.^. CourseParticipantUser) E.==. note E.?. CourseUserNoteUser
-  E.on $           participant E.^. CourseParticipantUser  E.==. user E.^. UserId
+  E.on $ E.just (participant E.^. CourseParticipantUser) E.==. note E.?. CourseUserNoteUser
+  E.on $         participant E.^. CourseParticipantUser  E.==. user E.^. UserId
   E.where_ $ whereClause t
   return (user, participant E.^. CourseParticipantRegistration, note E.?. CourseUserNoteId)
 
@@ -687,7 +687,7 @@ makeCourseUserTable whereClause colChoices psValidator =
   let dbtIdent     = "courseUsers" :: Text
       dbtStyle     = def
       dbtSQLQuery  = userTableQuery whereClause
-      dbtRowKey    = (\((user `E.InnerJoin` _participant) `E.LeftOuterJoin` _note) -> user E.^. UserId)
+      dbtRowKey ((user `E.InnerJoin` _participant) `E.LeftOuterJoin` _note) = user E.^. UserId
       dbtProj      = return -- . dbrOutput -- NOT SURE
       dbtColonnade = colChoices
       dbtSorting   = Map.fromList [] -- TODO