diff -r 91d1fc2a3a14 -r 33b6843fdf8a src/main/java/de/uapcore/lightpit/entities/User.java
--- a/src/main/java/de/uapcore/lightpit/entities/User.java	Fri May 22 17:26:27 2020 +0200
+++ b/src/main/java/de/uapcore/lightpit/entities/User.java	Fri May 22 21:23:57 2020 +0200
@@ -80,21 +80,26 @@
         this.lastname = lastname;
     }
 
-    public String getDisplayname() {
+    public String getShortDisplayname() {
         StringBuilder dn = new StringBuilder();
         if (givenname != null)
             dn.append(givenname);
         dn.append(' ');
         if (lastname != null)
             dn.append(lastname);
-        dn.append(' ');
-        if (mail != null && !mail.isBlank()) {
-            dn.append("<" + mail + ">");
-        }
         final var str = dn.toString().trim();
         return str.isBlank() ? username : str;
     }
 
+    public String getDisplayname() {
+        final String sdn = getShortDisplayname();
+        if (mail != null && !mail.isBlank()) {
+            return sdn + " <" + mail + ">";
+        } else {
+            return sdn;
+        }
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;