diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly
index 49c91300a84066791eb358e1e42a6efab3b8a137..804479d4cf27700d6ed93b2ffd5e3c73e16eb8fd 100644
--- a/core/src/main/resources/lib/layout/layout.jelly
+++ b/core/src/main/resources/lib/layout/layout.jelly
@@ -173,8 +173,17 @@ ${h.initPageVariables(context)}
                 <st:nbsp/>
                 <j:choose>
                   <j:when test="${!h.isAnonymous()}">
+                    <j:set var="user" value="${app.getUser(app.authentication.name)}"/>
+                    <j:choose>
+                      <j:when test="${user.fullName == null || user.fullName.trim().isEmpty()}">
+                        <j:set var="userName" value="${user.id}"/>
+                      </j:when>
+                      <j:otherwise>
+                        <j:set var="userName" value="${user.fullName}"/>
+                      </j:otherwise>
+                    </j:choose>
                     <span style="white-space:nowrap">
-                      <a href="${rootURL}/user/${app.authentication.name}" class="model-link inside"><b>${app.authentication.name}</b></a>
+                      <a href="${rootURL}/user/${user.id}" class="model-link inside"><b>${userName}</b></a>
                       <j:if test="${app.securityRealm.canLogOut()}">
                         |
                         <a href="${rootURL}/logout"><b>${%logout}</b></a>