diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/types/Person.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/types/Person.xsl
index 9737db5fb..0c4d6a428 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/types/Person.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/types/Person.xsl
@@ -200,6 +200,7 @@
       </xsl:call-template>
     </xsl:variable>
 
+
     <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
       <a>
         <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
@@ -238,7 +239,7 @@
             <xsl:value-of select="./givenname"/>
             <xsl:text> </xsl:text>
           </xsl:if>
-          <xsl:if test="string-length(./givenname) &gt; 0">
+          <xsl:if test="string-length(./surname) &gt; 0">
             <xsl:value-of select="./surname"/>
           </xsl:if>
           <xsl:if test="string-length(./titlePost) &gt; 0">
@@ -257,7 +258,7 @@
             <xsl:value-of select="./givenname"/>
             <xsl:text> </xsl:text>
           </xsl:if>
-          <xsl:if test="string-length(./givenname) &gt; 0">
+          <xsl:if test="string-length(./surname) &gt; 0">
             <xsl:value-of select="./surname"/>
           </xsl:if>
           <xsl:if test="string-length(./titlePost) &gt; 0">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciMember/SciMember.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciMember/SciMember.xsl
index 5654b6405..aca4a7970 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciMember/SciMember.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciMember/SciMember.xsl
@@ -285,7 +285,7 @@
                         <xsl:value-of select="./givenname"/>
                         <xsl:text> </xsl:text>
                     </xsl:if>
-                    <xsl:if test="string-length(./givenname) &gt; 0">
+                    <xsl:if test="string-length(./surname) &gt; 0">
                         <xsl:value-of select="./surname"/>
                     </xsl:if>
                     <xsl:if test="string-length(./titlepost) &gt; 0">