diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/UserDetailsFormatter.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/UserDetailsFormatter.java
index 04ad0c51a..d4a733de3 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/UserDetailsFormatter.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/UserDetailsFormatter.java
@@ -88,12 +88,10 @@ public final class UserDetailsFormatter {
      * name to max 12 characters. @see
      * {@link UserDetailsFormatter#loadAndFormatUsername(String, int)}
      * 
-     * @param baseEntity
-     *            the entity
      * @return the formatted user name (max 12 characters) cannot be <null>
      */
-    public static String loadAndFormatCurrentUsername() {
-        return loadAndFormatUsername(getCurrentUser().getUsername(), 12);
+    public static String formatCurrentUsername() {
+        return loadAndFormatUsername(getCurrentUser().getUsername(), 5);
     }
 
     /**
@@ -114,6 +112,10 @@ public final class UserDetailsFormatter {
      */
     public static String loadAndFormatUsername(final String username, final int expectedNameLength) {
         final UserDetails userDetails = loadUserByUsername(username);
+        return formatUserName(expectedNameLength, userDetails);
+    }
+
+    private static String formatUserName(final int expectedNameLength, final UserDetails userDetails) {
         if (!(userDetails instanceof UserPrincipal)) {
             return userDetails.getUsername();
         }
@@ -134,7 +136,7 @@ public final class UserDetailsFormatter {
         if (StringUtils.isEmpty(trimmedUsername)) {
             return trimAndFormatDetail(userPrincipal.getLoginname(), expectedNameLength);
         }
-        return firstAndLastname;
+        return trimmedUsername;
     }
 
     /**
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java
index 690cb51a2..5a822ff86 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java
@@ -193,7 +193,7 @@ public final class DashboardMenu extends CustomComponent {
         final MenuItem settingsItem = settings.addItem("", new ThemeResource("images/profile-pic-57px.jpg"), null);
 
         final String formattedTenant = UserDetailsFormatter.formatCurrentTenant();
-        final String formattedUsername = UserDetailsFormatter.loadAndFormatCurrentUsername();
+        final String formattedUsername = UserDetailsFormatter.formatCurrentUsername();
         String tenantAndUsernameHtml = "";
         if (!StringUtils.isEmpty(formattedTenant)) {
             tenantAndUsernameHtml += formattedTenant + "<br>";