diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 5697b7bd4..4c1d7a153 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -553,7 +553,7 @@ courseEditHandler miButtonAction mbCourseForm = do
                         case insertRes of
                           Just _  ->
                             queueDBJob . JobLecturerInvitation aid $ LecturerInvitation lEmail cid mLTy
-                          Nothing -> 
+                          Nothing ->
                             updateBy (UniqueLecturerInvitation lEmail cid) [ LecturerInvitationType =. mLTy ]
                     insert_ $ CourseEdit aid now cid
                     addMessageI Success $ MsgCourseEditOk tid ssh csh
@@ -803,8 +803,9 @@ userTableQuery :: CourseId -> UserTableExpr -> E.SqlQuery ( E.SqlExpr (Entity Us
 userTableQuery cid ((user `E.InnerJoin` participant) `E.LeftOuterJoin` note `E.LeftOuterJoin` studyFeatures) = do
   -- Note that order of E.on for nested joins is seemingly right-to-left, ignoring nesting paranthesis
   features <- studyFeaturesQuery' (participant E.^. CourseParticipantField) studyFeatures
-  E.on $ E.just (participant E.^. CourseParticipantUser) E.==. note E.?. CourseUserNoteUser
-  E.on $         participant E.^. CourseParticipantUser  E.==. user E.^. UserId
+  E.on $  (note E.?. CourseUserNoteUser   E.==. E.just (participant E.^. CourseParticipantUser))
+    E.&&. (note E.?. CourseUserNoteCourse E.==. E.just (E.val cid))
+  E.on $     participant E.^. CourseParticipantUser   E.==. user E.^. UserId
   E.where_ $ participant E.^. CourseParticipantCourse E.==. E.val cid
   return (user, participant E.^. CourseParticipantRegistration, note E.?. CourseUserNoteId, features)
 
@@ -1130,7 +1131,7 @@ postCCommR tid ssh csh = do
         evalAccessDB (CourseR tid ssh csh $ CUserR cID) False
     }
 
- 
+
 data ButtonLecInvite = BtnLecInvAccept | BtnLecInvDecline
   deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
 instance Universe ButtonLecInvite