Index: lams_tool_leader/web/pages/learning/leaderselection.jsp
===================================================================
diff -u -r7a1a9b453d15b75fbdbd78906aa7ced81f4c711e -rd0f4c3bdd871e236755472c8443c337b2b96e48c
--- lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 7a1a9b453d15b75fbdbd78906aa7ced81f4c711e)
+++ lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision d0f4c3bdd871e236755472c8443c337b2b96e48c)
@@ -62,7 +62,7 @@
     <div id="container-main">
         <c:choose>
             <c:when test="${not empty groupLeader}">
-                <lams:LeaderDisplay username="${groupLeader.firstName} ${groupLeader.lastName}" userId="${groupLeader.userId}" />
+                <lams:LeaderDisplay username="${groupLeader.getFullName()}" userId="${groupLeader.userId}" />
             </c:when>
             <c:otherwise>
                 <fmt:message key="label.no.leader.yet.title" var="alertTitle"/>
@@ -83,7 +83,7 @@
                         <div id="user-${user.userId}" role="listitem" class="col-md-4 my-2 text-md-start">
                             <lams:Portrait userId="${user.userId}" />
                             <span>
-								<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+								<c:out value="${user.getFullName()}" escapeXml="true" />
 							</span>
                         </div>
                     </c:forEach>
@@ -142,7 +142,7 @@
                             <div id="user-${user.userId}-modal" class="ps-2">
                                 <lams:Portrait userId="${user.userId}" />
                                 <span class="ms-2">
-									<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+									<c:out value="${user.getFullName()}" escapeXml="true" />
 								</span>
                             </div>
                         </c:forEach>