diff --git a/src/Handler/Utils/Widgets.hs b/src/Handler/Utils/Widgets.hs
index 1845862c3..88423194e 100644
--- a/src/Handler/Utils/Widgets.hs
+++ b/src/Handler/Utils/Widgets.hs
@@ -93,7 +93,15 @@ nameHtml :: Text -> Text -> Html
 nameHtml displayName surname
   | null surname = toHtml displayName
   | otherwise = case reverse $ T.splitOn surname displayName of
-      [_notContained] -> [shamlet|$newline never
+      [_notContained]
+        | (suffix:prefixes) <- reverse $ T.splitOn (T.toTitle surname) (T.toTitle displayName) ->
+          let prefix = T.intercalate surname $ reverse prefixes
+          in [shamlet|$newline never
+                #{prefix}
+                <b .surname>#{surname}
+                #{suffix}
+              |]
+        | otherwise -> [shamlet|$newline never
                             #{displayName} (
                             <b .surname>#{surname}
                             )|]