diff --git a/src/Handler/Course/List.hs b/src/Handler/Course/List.hs
index c3d110a8a..19aac2caf 100644
--- a/src/Handler/Course/List.hs
+++ b/src/Handler/Course/List.hs
@@ -158,7 +158,7 @@ makeCourseTable whereClause colChoices psValidator = do
       , Just  $ prismAForm (singletonFilter "schoolshort" . maybePrism (_PathPiece . from _SchoolId)) mPrev $ aopt (hoistField lift schoolField) (fslI MsgCourseSchool)
       , Just  $ prismAForm (singletonFilter "lecturer") mPrev $ aopt textField (fslI MsgCourseLecturer)
       , Just  $ prismAForm (singletonFilter "search") mPrev $ aopt textField (fslI MsgCourseFilterSearch)
-      , Just  $ prismAForm (singletonFilter "openregistration" . maybePrism _PathPiece) mPrev $ aopt boolField (fslI MsgCourseRegisterOpen)
+      , Just  $ prismAForm (singletonFilter "openregistration" . maybePrism _PathPiece) mPrev $ aopt boolField (fslI MsgCourseRegisterOpen)  -- TODO: checkbox instead of boolField
       , muid $> prismAForm (singletonFilter "registered" . maybePrism _PathPiece) mPrev (aopt boolField (fslI MsgCourseFilterRegistered))
       ]
     , dbtStyle = def
diff --git a/templates/table/course/course-teaser.hamlet b/templates/table/course/course-teaser.hamlet
index 4ef13ef08..8ba66493f 100644
--- a/templates/table/course/course-teaser.hamlet
+++ b/templates/table/course/course-teaser.hamlet
@@ -9,13 +9,14 @@
       _{courseName}
   $if isRegistered
     <div .course-teaser__registration>_{MsgRegistered}
-  <div .course-teaser__lecturer-label>
-    _{MsgLecturersForN (length courseLecturers)}
-  <div .course-teaser__lecturer-value>
-    <ul .list--inline .list--comma-separated>
-      $forall lecturer <- courseLecturers
-        <li>
-          #{lecturer}
+  $if not $ null courseLecturers
+    <div .course-teaser__lecturer-label>
+      _{MsgLecturersForN (length courseLecturers)}
+    <div .course-teaser__lecturer-value>
+      <ul .list--inline .list--comma-separated>
+        $forall lecturer <- courseLecturers
+          <li>
+            #{lecturer}
   $maybe regTo <- courseRegisterTo
     <div .course-teaser__duedate-label>_{MsgRegisterTo}
     <div .course-teaser__duedate-value>^{formatTimeW SelFormatDateTime regTo}