diff --git a/src/Handler/Course/List.hs b/src/Handler/Course/List.hs
index 16b67cb9c..55ab97a2b 100644
--- a/src/Handler/Course/List.hs
+++ b/src/Handler/Course/List.hs
@@ -83,7 +83,7 @@ makeCourseTable whereClause colChoices psValidator = do
         return (course, participants, registered, school)
       lecturerQuery cid (user `E.InnerJoin` lecturer) = do
         E.on $ user E.^. UserId E.==. lecturer E.^. LecturerUser
-        E.where_ $ cid E.==. lecturer E.^. LecturerCourse
+        E.where_ $ cid E.==. lecturer E.^. LecturerCourse E.&&. lecturer E.^. LecturerType E.==. E.val CourseLecturer
         return user
       dbtProj :: DBRow _ -> MaybeT (ReaderT SqlBackend (HandlerT UniWorX IO)) CourseTableData
       dbtProj = traverse $ \(course, E.Value participants, E.Value registered, school) -> do
@@ -138,7 +138,7 @@ makeCourseTable whereClause colChoices psValidator = do
         -- , ( "openregistration", FilterColumn $ \(course `E.InnerJoin` _school) criterion -> case getLast (criterion :: Last Bool) of
         --     Nothing     -> E.val True :: E.SqlExpr (E.Value Bool)
         --     -- TODO: get current time??
-        --     Just True   -> (maybe (E.val True :: E.SqlExpr (E.Value Bool)) ((E.<=.) today) $ course E.^. CourseRegisterTo) E.&&. (maybe (E.val True :: E.SqlExpr (E.Value Bool)) ((E.>.) today) $ course E.^. CourseRegisterFrom)
+        --     Just True   -> (maybe (E.val True :: E.SqlExpr (E.Value Bool)) ((E.<=.) today) $ course E.^. CourseRegisterTo) E.&&. (maybe (E.val True :: E.SqlExpr (E.Value Bool)) ((E.>=.) today) $ course E.^. CourseRegisterFrom)
         --     _           -> E.val False :: E.SqlExpr (E.Value Bool)  -- TODO: rethink
         --   )
         , ( "registered", FilterColumn $ \tExpr criterion -> case getLast (criterion :: Last Bool) of