diff --git a/src/Foundation/Yesod/Auth.hs b/src/Foundation/Yesod/Auth.hs
index 6b688b48c..d5c45f106 100644
--- a/src/Foundation/Yesod/Auth.hs
+++ b/src/Foundation/Yesod/Auth.hs
@@ -261,7 +261,7 @@ upsertCampusUser upsertMode ldapData = do
       , userScheduleWeekTimeFrom = userDefaultScheduleWeekTimeFrom
       , userScheduleWeekTimeTo   = userDefaultScheduleWeekTimeTo
       , userScheduleWeekTimeslotLength = userDefaultScheduleWeekTimeslotLength
-      , userScheduleNewCoursesDisplayDefault = userDefaultScheduleNewCoursesDisplayDefault
+      , userScheduleOccurrenceDisplayDefault = userDefaultScheduleOccurrenceDisplayDefault
       , userNotificationSettings = def
       , userLanguages            = Nothing
       , userCsvOptions           = def
diff --git a/src/Handler/Users/Add.hs b/src/Handler/Users/Add.hs
index 91a5fcd47..df28be187 100644
--- a/src/Handler/Users/Add.hs
+++ b/src/Handler/Users/Add.hs
@@ -80,7 +80,7 @@ postAdminUserAddR = do
         , userScheduleWeekTimeFrom    = userDefaultScheduleWeekTimeFrom
         , userScheduleWeekTimeTo      = userDefaultScheduleWeekTimeTo
         , userScheduleWeekTimeslotLength = userDefaultScheduleWeekTimeslotLength
-        , userScheduleNewCoursesDisplayDefault = userDefaultScheduleNewCoursesDisplayDefault
+        , userScheduleOccurrenceDisplayDefault = userDefaultScheduleOccurrenceDisplayDefault
         , userNotificationSettings    = def
         , userLanguages               = Nothing
         , userCsvOptions              = def
diff --git a/test/Database/Fill.hs b/test/Database/Fill.hs
index d479c5ed5..4e46553be 100644
--- a/test/Database/Fill.hs
+++ b/test/Database/Fill.hs
@@ -113,6 +113,7 @@ fillDb = do
     , userDateTimeFormat = userDefaultDateTimeFormat
     , userDateFormat = userDefaultDateFormat
     , userTimeFormat = userDefaultTimeFormat
+    , userWeekStart = userDefaultWeekStart
     , userDownloadFiles = userDefaultDownloadFiles
     , userWarningDays = userDefaultWarningDays
     , userLanguages = Just $ Languages ["en"]
@@ -124,6 +125,10 @@ fillDb = do
     , userSex = Just SexMale
     , userShowSex = userDefaultShowSex
     , userScheduleView = userDefaultScheduleView
+    , userScheduleWeekTimeFrom = userDefaultScheduleWeekTimeFrom
+    , userScheduleWeekTimeTo = userDefaultScheduleWeekTimeTo
+    , userScheduleWeekTimeslotLength = userDefaultScheduleWeekTimeslotLength
+    , userScheduleOccurrenceDisplayDefault = userDefaultScheduleOccurrenceDisplayDefault
     }
   fhamann <- insert User
     { userIdent  = "felix.hamann@campus.lmu.de"
@@ -143,6 +148,7 @@ fillDb = do
     , userDateTimeFormat = userDefaultDateTimeFormat
     , userDateFormat = userDefaultDateFormat
     , userTimeFormat = userDefaultTimeFormat
+    , userWeekStart = userDefaultWeekStart
     , userDownloadFiles = userDefaultDownloadFiles
     , userWarningDays = userDefaultWarningDays
     , userLanguages = Nothing
@@ -154,6 +160,10 @@ fillDb = do
     , userSex = Just SexMale
     , userShowSex = userDefaultShowSex
     , userScheduleView = userDefaultScheduleView
+    , userScheduleWeekTimeFrom = userDefaultScheduleWeekTimeFrom
+    , userScheduleWeekTimeTo = userDefaultScheduleWeekTimeTo
+    , userScheduleWeekTimeslotLength = userDefaultScheduleWeekTimeslotLength
+    , userScheduleOccurrenceDisplayDefault = userDefaultScheduleOccurrenceDisplayDefault
     }
   jost <- insert User
     { userIdent  = "jost@tcs.ifi.lmu.de"
@@ -173,6 +183,7 @@ fillDb = do
     , userDateTimeFormat = userDefaultDateTimeFormat
     , userDateFormat = userDefaultDateFormat
     , userTimeFormat = userDefaultTimeFormat
+    , userWeekStart = userDefaultWeekStart
     , userDownloadFiles = userDefaultDownloadFiles
     , userWarningDays = userDefaultWarningDays
     , userLanguages = Nothing
@@ -184,6 +195,10 @@ fillDb = do
     , userCsvOptions = def
     , userShowSex = userDefaultShowSex
     , userScheduleView = userDefaultScheduleView
+    , userScheduleWeekTimeFrom = userDefaultScheduleWeekTimeFrom
+    , userScheduleWeekTimeTo = userDefaultScheduleWeekTimeTo
+    , userScheduleWeekTimeslotLength = userDefaultScheduleWeekTimeslotLength
+    , userScheduleOccurrenceDisplayDefault = userDefaultScheduleOccurrenceDisplayDefault
     }
   maxMuster <- insert User
     { userIdent  = "max@campus.lmu.de"
@@ -203,6 +218,7 @@ fillDb = do
     , userMaxFavouriteTerms = userDefaultMaxFavouriteTerms
     , userDateFormat = userDefaultDateFormat
     , userTimeFormat = userDefaultTimeFormat
+    , userWeekStart = userDefaultWeekStart
     , userDownloadFiles = userDefaultDownloadFiles
     , userWarningDays = userDefaultWarningDays
     , userLanguages = Just $ Languages ["de"]
@@ -214,6 +230,10 @@ fillDb = do
     , userSex = Just SexMale
     , userShowSex = userDefaultShowSex
     , userScheduleView = userDefaultScheduleView
+    , userScheduleWeekTimeFrom = userDefaultScheduleWeekTimeFrom
+    , userScheduleWeekTimeTo = userDefaultScheduleWeekTimeTo
+    , userScheduleWeekTimeslotLength = userDefaultScheduleWeekTimeslotLength
+    , userScheduleOccurrenceDisplayDefault = userDefaultScheduleOccurrenceDisplayDefault
     }
   tinaTester <- insert $ User
     { userIdent  = "tester@campus.lmu.de"
@@ -233,6 +253,7 @@ fillDb = do
     , userDateTimeFormat = userDefaultDateTimeFormat
     , userDateFormat = userDefaultDateFormat
     , userTimeFormat = userDefaultTimeFormat
+    , userWeekStart = userDefaultWeekStart
     , userDownloadFiles = userDefaultDownloadFiles
     , userWarningDays = userDefaultWarningDays
     , userLanguages = Just $ Languages ["sn"]
@@ -244,6 +265,10 @@ fillDb = do
     , userSex = Just SexNotApplicable
     , userShowSex = userDefaultShowSex
     , userScheduleView = userDefaultScheduleView
+    , userScheduleWeekTimeFrom = userDefaultScheduleWeekTimeFrom
+    , userScheduleWeekTimeTo = userDefaultScheduleWeekTimeTo
+    , userScheduleWeekTimeslotLength = userDefaultScheduleWeekTimeslotLength
+    , userScheduleOccurrenceDisplayDefault = userDefaultScheduleOccurrenceDisplayDefault
     }
   svaupel <- insert User
     { userIdent  = "vaupel.sarah@campus.lmu.de"
@@ -263,6 +288,7 @@ fillDb = do
     , userDateTimeFormat = userDefaultDateTimeFormat
     , userDateFormat = userDefaultDateFormat
     , userTimeFormat = userDefaultTimeFormat
+    , userWeekStart = userDefaultWeekStart
     , userDownloadFiles = userDefaultDownloadFiles
     , userWarningDays = userDefaultWarningDays
     , userLanguages = Nothing
@@ -274,6 +300,10 @@ fillDb = do
     , userSex = Just SexFemale
     , userShowSex = userDefaultShowSex
     , userScheduleView = userDefaultScheduleView
+    , userScheduleWeekTimeFrom = userDefaultScheduleWeekTimeFrom
+    , userScheduleWeekTimeTo = userDefaultScheduleWeekTimeTo
+    , userScheduleWeekTimeslotLength = userDefaultScheduleWeekTimeslotLength
+    , userScheduleOccurrenceDisplayDefault = userDefaultScheduleOccurrenceDisplayDefault
     }
 
   let
@@ -323,6 +353,7 @@ fillDb = do
       , userDateTimeFormat = userDefaultDateTimeFormat
       , userDateFormat = userDefaultDateFormat
       , userTimeFormat = userDefaultTimeFormat
+      , userWeekStart = userDefaultWeekStart
       , userDownloadFiles = userDefaultDownloadFiles
       , userWarningDays = userDefaultWarningDays
       , userLanguages = Nothing
@@ -334,6 +365,10 @@ fillDb = do
       , userSex = Nothing
       , userShowSex = userDefaultShowSex
       , userScheduleView = userDefaultScheduleView
+      , userScheduleWeekTimeFrom = userDefaultScheduleWeekTimeFrom
+      , userScheduleWeekTimeTo = userDefaultScheduleWeekTimeTo
+      , userScheduleWeekTimeslotLength = userDefaultScheduleWeekTimeslotLength
+      , userScheduleOccurrenceDisplayDefault = userDefaultScheduleOccurrenceDisplayDefault
       }
       where
         userIdent :: IsString t => t