diff --git a/src/Handler/Course/ParticipantInvite.hs b/src/Handler/Course/ParticipantInvite.hs
index e617e77dd..475c501eb 100644
--- a/src/Handler/Course/ParticipantInvite.hs
+++ b/src/Handler/Course/ParticipantInvite.hs
@@ -42,7 +42,7 @@ defaultTutorialType :: TutorialType
 defaultTutorialType = "Schulung"
 
 tutorialTypeSeparator :: TutorialType
-tutorialTypeSeparator = "___"
+tutorialTypeSeparator = "_"
 
 tutorialTemplateNames :: Maybe TutorialType -> [TutorialType]
 tutorialTemplateNames Nothing     = ["Vorlage", "Template"]
@@ -52,7 +52,7 @@ tutorialDefaultName :: Maybe TutorialType -> Day -> TutorialName
 tutorialDefaultName Nothing     = CI.mk . tshow  -- Don't use user date display setting, so that tutorial default names conform to all users
 tutorialDefaultName (Just ttyp) = 
   let prefix = CI.mk $ snd $ Text.breakOnEnd (CI.original tutorialTypeSeparator) $ CI.original ttyp
-  in  ((prefix <> "_") <>) . tutorialDefaultName Nothing
+  in  ((prefix <> tutorialTypeSeparator) <>) . tutorialDefaultName Nothing
 
 data ButtonCourseRegisterMode = BtnCourseRegisterConfirm | BtnCourseRegisterAbort
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic)
@@ -74,7 +74,7 @@ instance Button UniWorX ButtonCourseRegisterMode where
 data CourseRegisterAction
    = CourseRegisterActionAddParticipant
    | CourseRegisterActionAddTutorialMember
--- | CourseRegisterActionUnknownPerson
+--   | CourseRegisterActionUnknownPerson
    deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic)
 instance Universe CourseRegisterAction
 instance Finite CourseRegisterAction
@@ -89,7 +89,7 @@ data CourseRegisterActionData
      , crActUser     :: (UserId, User)
      , crActTutorial :: (Maybe TutorialName, Maybe TutorialType, Maybe Day)
      }
--- | CourseRegisterActionUnknownPersonData -- pseudo-action; just for display
+--   | CourseRegisterActionUnknownPersonData -- pseudo-action; just for display
 --   { crActUnknownPersonIdent :: Text
 --   }
    deriving (Eq, Ord, Show, Generic)