diff --git a/models b/models
index 88a300dba..341499e8f 100644
--- a/models
+++ b/models
@@ -4,7 +4,7 @@ User json
     matrikelnummer Text Maybe
     email          (CI Text)
     displayName    Text
-    surname        Text
+    surname        Text            -- always use: nameWidget displayName surname
     maxFavourites  Int default=12
     theme          Theme default='Default'
     dateTimeFormat DateTimeFormat "default='%a %d %b %Y %R'"
diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs
index f2902da57..8e51adff9 100644
--- a/src/Handler/Utils.hs
+++ b/src/Handler/Utils.hs
@@ -39,9 +39,16 @@ nameWidget :: Text -> Text -> Widget
 nameWidget displayName surname
   | null surname = toWidget displayName
   | otherwise = case reverse $ T.splitOn surname displayName of
-      [_notContained] -> [whamlet|#{displayName} (<b .surname>#{surname}</b>)|]
+      [_notContained] -> [whamlet|$newline never
+                            #{displayName} (
+                            <b .surname>#{surname}
+                            )|]
       (suffix:prefixes) ->
         let prefix = T.intercalate surname $ reverse prefixes
-        in [whamlet|#{prefix}<b .surname>#{surname}</b>#{suffix}|]
+        in [whamlet|$newline never
+              #{prefix}
+              <b .surname>#{surname}
+              #{suffix}
+            |]
       [] -> error "Data.Text.splitOn returned empty list in violation of specification."
 
diff --git a/templates/profile.hamlet b/templates/profile.hamlet
index 44116dc60..f5bfae509 100644
--- a/templates/profile.hamlet
+++ b/templates/profile.hamlet
@@ -2,7 +2,7 @@
 
   <dl .deflist.profile-dl>
       <dt .deflist__dt> _{MsgName}
-      <dd .deflist__dd> #{display userDisplayName}
+      <dd .deflist__dd> ^{nameWidget userDisplayName userSurname}
       <dt .deflist__dt> _{MsgMatrikelNr}
       <dd .deflist__dd> #{display userMatrikelnummer}
       <dt .deflist__dt> _{MsgEMail}