diff --git a/src/Handler/Course/Show.hs b/src/Handler/Course/Show.hs
index 45a5615e1..3bd893b11 100644
--- a/src/Handler/Course/Show.hs
+++ b/src/Handler/Course/Show.hs
@@ -302,6 +302,13 @@ getCShowR tid ssh csh = do
   mayCreateEvents <- hasWriteAccessTo $ CourseR tid ssh csh CEventsNewR
   mayEdit <- hasWriteAccessTo $ CourseR tid ssh csh CEditR
 
+  let courseScheduleOptToggleValue User{userScheduleOccurrenceDisplayDefault} = maybe
+        ( userScheduleOccurrenceDisplayDefault
+          && ( is _Just registration )
+        )
+        (courseScheduleOptOpt . entityVal)
+        mCourseScheduleOpt
+
   let heading = [whamlet|
           $newline never
           ^{courseName course}
diff --git a/templates/course.hamlet b/templates/course.hamlet
index d98b39077..1442a2e22 100644
--- a/templates/course.hamlet
+++ b/templates/course.hamlet
@@ -340,12 +340,12 @@ $#    $if NTop (Just 0) < NTop (courseCapacity course)
     <dd .deflist__dd>
       ^{tutorialTable}
 
-  $maybe (_, User{userScheduleOccurrenceDisplayDefault}) <- mbAuth
+  $maybe (_, user) <- mbAuth
     <dt .deflist__dt>
       _{MsgScheduleOptActions}
     <dd .deflist__dd>
-      <a .btn .btn-primary href=@{CourseR tid ssh csh (CScheduleOptSetR (not (maybe ((is _Just registration) && userScheduleOccurrenceDisplayDefault) (courseScheduleOptOpt . entityVal) mCourseScheduleOpt)))}>
-        _{bool MsgCourseScheduleOptIn MsgCourseScheduleOptOut (maybe ((is _Just registration) && userScheduleOccurrenceDisplayDefault) (courseScheduleOptOpt . entityVal) mCourseScheduleOpt)}
+      <a .btn .btn-primary href=@{CourseR tid ssh csh (CScheduleOptSetR (not (courseScheduleOptToggleValue user)))}>
+        _{bool MsgCourseScheduleOptIn MsgCourseScheduleOptOut (courseScheduleOptToggleValue user)}
       $if is _Just mCourseScheduleOpt
         <a .btn .btn-primary href=@{CourseR tid ssh csh CScheduleOptDelR}>
           _{MsgCourseScheduleOptDelete}