diff --git a/src/Handler/Course/Show.hs b/src/Handler/Course/Show.hs
index e2ad85f9a..6029f6297 100644
--- a/src/Handler/Course/Show.hs
+++ b/src/Handler/Course/Show.hs
@@ -28,7 +28,7 @@ getCShowR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getCShowR tid ssh csh = do
   mbAuth <- maybeAuthPair
   now <- liftIO getCurrentTime
-  (cid,course,courseVisible,schoolName,participants,registration,lecturers,assistants,correctors,tutors,mAllocation,hasApplicationTemplate,mApplication,news,events,submissionGroup,hasAllocationRegistrationOpen,mayReRegister) <- runDB . maybeT notFound $ do
+  (cid,course,courseVisible,schoolName,participants,registration,lecturers,assistants,correctors,tutors,mAllocation,hasApplicationTemplate,mApplication,news,events,submissionGroup,hasAllocationRegistrationOpen,mayReRegister,mCourseScheduleOpt) <- runDB . maybeT notFound $ do
     [(E.Entity cid course, E.Value courseVisible, E.Value schoolName, E.Value participants, fmap entityVal -> registration, E.Value hasAllocationRegistrationOpen)]
        <- lift . E.select . E.from $
          \((school `E.InnerJoin` course) `E.LeftOuterJoin` participant) -> do
@@ -113,7 +113,11 @@ getCShowR tid ssh csh = do
 
     mayReRegister <- lift . courseMayReRegister $ Entity cid course
 
-    return (cid,course,courseVisible,schoolName,participants,registration,lecturers,assistants,correctors,tutors,mAllocation,hasApplicationTemplate,mApplication,news,events,submissionGroup,hasAllocationRegistrationOpen,mayReRegister)
+    mCourseScheduleOpt <- case mbAuth of
+      Just (uid,_) -> lift $ getBy $ UniqueCourseScheduleOpt cid uid
+      Nothing -> return Nothing
+
+    return (cid,course,courseVisible,schoolName,participants,registration,lecturers,assistants,correctors,tutors,mAllocation,hasApplicationTemplate,mApplication,news,events,submissionGroup,hasAllocationRegistrationOpen,mayReRegister,mCourseScheduleOpt)
 
   let mDereg' = maybe id min (allocationOverrideDeregister =<< mAllocation) <$> courseDeregisterUntil course
   mDereg <- traverse (formatTime SelFormatDateTime) mDereg'
diff --git a/templates/course.hamlet b/templates/course.hamlet
index 492983963..10fe0f585 100644
--- a/templates/course.hamlet
+++ b/templates/course.hamlet
@@ -315,3 +315,12 @@ $#    $if NTop (Just 0) < NTop (courseCapacity course)
     <dd .deflist__dd>
       ^{tutorialTable}
 
+  $maybe (_, User{userScheduleOccurrenceDisplayDefault}) <- mbAuth
+    <dt .deflist__dt>
+      _{MsgScheduleOptActions}
+    <dd .deflist__dd>
+      <a .btn .btn-primary href=@{CourseR tid ssh csh (CScheduleOptSetR (not (maybe userScheduleOccurrenceDisplayDefault (courseScheduleOptOpt . entityVal) mCourseScheduleOpt)))}>
+        _{bool MsgCourseScheduleOptIn MsgCourseScheduleOptOut (maybe userScheduleOccurrenceDisplayDefault (courseScheduleOptOpt . entityVal) mCourseScheduleOpt)}
+      $if is _Just mCourseScheduleOpt
+        <a .btn .btn-primary href=@{CourseR tid ssh csh CScheduleOptDelR}>
+          _{MsgCourseScheduleOptDelete}