diff --git a/src/Handler/Schedule.hs b/src/Handler/Schedule.hs
index d2341710f..1cf749d96 100644
--- a/src/Handler/Schedule.hs
+++ b/src/Handler/Schedule.hs
@@ -13,16 +13,15 @@ import Utils.Schedule.Week
 getScheduleR, postScheduleR :: Handler Html
 getScheduleR = postScheduleR
 postScheduleR = do
-  uid <- requireAuthId
+  Entity uid User{userScheduleView} <- requireAuth
 
   -- TODO: local instead of global get params?
   mOptions <- lookupGlobalGetParam GetScheduleOptions
 
   let
-    -- TODO: persist default schedule view in user settings and choose scheduleView accordingly
     defaultScheduleOptions :: ScheduleOptions
     defaultScheduleOptions = ScheduleOptions
-                             { scheduleView   = ScheduleViewWeek
+                             { scheduleView   = userScheduleView
                              , scheduleOffset = ScheduleOffsetNone
                              , scheduleOptionsAction = ScheduleSetDefault
                              }