diff --git a/config/settings.yml b/config/settings.yml
index af9936f30..eed1151e7 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -217,7 +217,7 @@ user-defaults:
   schedule-week-time-from:  8
   schedule-week-time-to:    18
   schedule-week-timeslot-length: 2
-  schedule-new-courses-display-default: true
+  schedule-occurrence-display-default: true
 
 # During central allocations lecturer-given ratings of applications (as
 # ExamGrades) are combined with a central priority.
diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index 7fd848572..3cfe8f0b8 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -125,8 +125,8 @@ ScheduleWeekTimeToMustBeAfterTimeFrom: Letzter Zeitslot muss nach erstem Zeitslo
 ScheduleWeekTimeslotLengthMustBeGreaterZero: Zeitslotlänge muss größer als null sein
 ScheduleWeekTimeFromToMustMatchTimeslotLength: Beginn des ersten und letzten Zeitslots der Wochenansicht muss mit der Zeitslotlänge übereinstimmen
 
-ScheduleNewCoursesDisplayDefault: Termine zu neuen Kursen standardmäßig darstellen
-ScheduleNewCoursesDisplayDefaultTip: Wenn gesetzt werden Termine zu Kursen, zu denen Sie sich anmelden nach erfolgter Anmeldung standardmäßig in Ihrer Terminübersicht dargestellt. Sie können die standardmäßige Darstellung pro Kurs und auch pro Einzeltermin überschreiben.
+ScheduleOccurrenceDisplayDefault: Termine standardmäßig darstellen
+ScheduleOccurrenceDisplayDefaultTip: Wenn gesetzt werden Termine zu Kursen, zu denen Sie sich anmelden nach erfolgter Anmeldung standardmäßig in Ihrer Terminübersicht dargestellt. Sie können die standardmäßige Darstellung pro Kurs und auch pro Einzeltermin überschreiben.
 
 ScheduleOffsetWeekBackwardWeek: 1 Woche zurück
 ScheduleOffsetWeekBackwardDay: 1 Tag zurück
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index 357f9beb8..36c96949f 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -126,8 +126,8 @@ ScheduleWeekTimeToMustBeAfterTimeFrom: Last timeslot must be after first timeslo
 ScheduleWeekTimeslotLengthMustBeGreaterZero: Timeslot length must be greater than zero
 ScheduleWeekTimeFromToMustMatchTimeslotLength: Start of the first and last timeslots to display in the weekly schedule must match with the given timeslot length
 
-ScheduleNewCoursesDisplayDefault: Display occurrences from new courses by default
-ScheduleNewCoursesDisplayDefaultTip: When set, occurrences from courses you register for are displayed in your schedule by default after registration. You may override the default display per course and also per single occurrence.
+ScheduleOccurrenceDisplayDefault: Display occurrences by default
+ScheduleOccurrenceDisplayDefaultTip: When set, occurrences from courses you register for are displayed in your schedule by default after registration. You may override the default display per course and also per single occurrence.
 
 ScheduleOffsetWeekBackwardWeek: 1 week back
 ScheduleOffsetWeekBackwardDay: 1 day back
diff --git a/models/users.model b/models/users.model
index fe5ac413d..70405a783 100644
--- a/models/users.model
+++ b/models/users.model
@@ -40,7 +40,7 @@ User json    -- Each Uni2work user has a corresponding row in this table; create
     scheduleWeekTimeFrom Int default=8   -- starting hour of the first time slot to display in weekly schedule by default (i.e. regardless of the existence of occurrences in this slot); TODO: increase precision to minutes
     scheduleWeekTimeTo   Int default=18  -- starting hour of the last  time slot to display in weekly schedule by default (i.e. regardless of the existence of occurrences in this slot); TODO: increase precision to minutes; TODO: save last hour/minute to display instead of first (of last time slot)
     scheduleWeekTimeslotLength Int default=2  -- length of one timeslot in hours; TODO: increase precision to minutes
-    scheduleNewCoursesDisplayDefault Bool default=True  -- whether occurrences from new courses should be displayed in the schedule by default
+    scheduleOccurrenceDisplayDefault Bool default=True  -- whether occurrences from new courses should be displayed in the schedule by default
     UniqueAuthentication ident                  -- Column 'ident' can be used as a row-key in this table
     UniqueEmail email                           -- Column 'email' can be used as a row-key in this table
     deriving Show Eq Ord Generic                -- Haskell-specific settings for runtime-value representing a row in memory
diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index b7303e0cf..82bf549dc 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -41,7 +41,7 @@ data SettingsForm = SettingsForm
       , stgScheduleWeekTimeFrom :: Int
       , stgScheduleWeekTimeTo   :: Int
       , stgScheduleWeekTimeslotLength :: Int
-      , stgScheduleNewCoursesDisplayDefault :: Bool
+      , stgScheduleOccurrenceDisplayDefault :: Bool
       , stgMaxFavourites        :: Int
       , stgMaxFavouriteTerms    :: Int
       , stgTheme                :: Theme
@@ -115,7 +115,7 @@ makeSettingForm template html = do
             (fslpI MsgScheduleWeekTimeTo   (mr MsgScheduleWeekTimeToPlaceholder  ) & setTooltip MsgScheduleWeekTimeToTip  ) (stgScheduleWeekTimeTo   <$> template)
         <*> areq (natFieldI MsgScheduleWeekTimeslotLength)
             (fslpI MsgScheduleWeekTimeslotLength (mr MsgScheduleWeekTimeslotLengthPlaceholder) & setTooltip MsgScheduleWeekTimeslotLengthTip) (stgScheduleWeekTimeslotLength <$> template)
-        <*> apopt checkBoxField (fslI MsgScheduleNewCoursesDisplayDefault & setTooltip MsgScheduleNewCoursesDisplayDefaultTip) (stgScheduleNewCoursesDisplayDefault <$> template)
+        <*> apopt checkBoxField (fslI MsgScheduleOccurrenceDisplayDefault & setTooltip MsgScheduleOccurrenceDisplayDefaultTip) (stgScheduleOccurrenceDisplayDefault <$> template)
         <*  aformSection MsgFormCosmetics
         <*> areq (natFieldI MsgFavouritesNotNatural)
             (fslpI MsgFavourites (mr MsgFavouritesPlaceholder) & setTooltip MsgFavouritesTip) (stgMaxFavourites <$> template)
@@ -394,7 +394,7 @@ postProfileR = do
         , stgScheduleWeekTimeFrom = userScheduleWeekTimeFrom
         , stgScheduleWeekTimeTo   = userScheduleWeekTimeTo
         , stgScheduleWeekTimeslotLength = userScheduleWeekTimeslotLength
-        , stgScheduleNewCoursesDisplayDefault = userScheduleNewCoursesDisplayDefault
+        , stgScheduleOccurrenceDisplayDefault = userScheduleOccurrenceDisplayDefault
         , stgMaxFavourites        = userMaxFavourites
         , stgMaxFavouriteTerms    = userMaxFavouriteTerms
         , stgTheme                = userTheme
@@ -419,7 +419,7 @@ postProfileR = do
         , UserScheduleWeekTimeFrom =. stgScheduleWeekTimeFrom
         , UserScheduleWeekTimeTo   =. stgScheduleWeekTimeTo
         , UserScheduleWeekTimeslotLength =. stgScheduleWeekTimeslotLength
-        , UserScheduleNewCoursesDisplayDefault =. stgScheduleNewCoursesDisplayDefault
+        , UserScheduleOccurrenceDisplayDefault =. stgScheduleOccurrenceDisplayDefault
         , UserMaxFavourites        =. stgMaxFavourites
         , UserMaxFavouriteTerms    =. stgMaxFavouriteTerms
         , UserTheme                =. stgTheme
diff --git a/src/Settings.hs b/src/Settings.hs
index 5b6502837..e331535cb 100644
--- a/src/Settings.hs
+++ b/src/Settings.hs
@@ -216,7 +216,7 @@ data UserDefaultConf = UserDefaultConf
   , userDefaultScheduleView :: ScheduleView
   , userDefaultScheduleWeekTimeFrom, userDefaultScheduleWeekTimeTo :: Int
   , userDefaultScheduleWeekTimeslotLength :: Int
-  , userDefaultScheduleNewCoursesDisplayDefault :: Bool
+  , userDefaultScheduleOccurrenceDisplayDefault :: Bool
   } deriving (Show)
 
 data PWHashConf = PWHashConf