diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsGreeting.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsGreeting.xsl
index 63c1cfa47..4e26433bb 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsGreeting.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsGreeting.xsl
@@ -50,7 +50,14 @@
       </xsl:call-template>
       &nbsp;
       <span class="cmsUserName">
-        <xsl:value-of select="$resultTree/@name"/>
+        <xsl:choose>
+          <xsl:when test="$resultTree/@name">
+            <xsl:value-of select="$resultTree/@name"/>
+          </xsl:when>
+          <xsl:when test="$resultTree//ui:userBanner/@screenName">
+            <xsl:value-of select="concat($resultTree//ui:userBanner/@givenName, '', $resultTree//ui:userBanner/@familyName)"/>
+          </xsl:when>
+        </xsl:choose>
       </span>
     </div>
   </xsl:template>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl
index aa3d722b3..cec72f7cf 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl
@@ -33,7 +33,8 @@
   xmlns:subsite="http://ccm.redhat.com/subsite/1.0"
   xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"
   xmlns:ppp="http://www.arsdigita.com/PublicPersonalProfile/1.0"
-  xmlns:mandalay="http://mandalay.quasiweb.de"  
+  xmlns:mandalay="http://mandalay.quasiweb.de"
+  xmlns:atoz="http://xmlns.redhat.com/atoz/1.0"
   exclude-result-prefixes="xsl aplaws bebop cms docs forum mandalay nav portal ppp search subsite terms ui"
   version="1.0">
 
@@ -651,7 +652,18 @@
   </xsl:template>
   
   <xsl:template match="useLogoutLink">
-    <xsl:apply-templates select="$resultTree/cms:globalNavigation/cms:signOut"/>
+    <xsl:choose>
+      <xsl:when test="$resultTree/cms:globalNavigation">
+        <xsl:apply-templates select="$resultTree/cms:globalNavigation/cms:signOut"/>
+      </xsl:when>
+      <xsl:when test="$resultTree/ui:userBanner">
+        <span class="cmsGlobalNavigationSignOut">
+          <a href="{$resultTree/ui:userBanner/@logoutURL}">
+            <xsl:apply-templates select="$resultTree/ui:userBanner/@signoutLabel"/>
+          </a>
+        </span>
+      </xsl:when>
+    </xsl:choose>
   </xsl:template>
   
   <xsl:template match="useHelpLink">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types.xsl
index 9fe3a3595..b5c8e1aa4 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types.xsl
@@ -42,7 +42,6 @@
   -->
   <xsl:import href="types/ContentBundle.xsl"/>  
   <xsl:import href="types/DecisionTree.xsl"/>  
-  <xsl:import href="types/DecisionTree.xsl"/>  
   <xsl:import href="types/PublicPersonalProfile.xsl"/>
   <xsl:import href="types/SciDepartment.xsl"/>
   <xsl:import href="types/SciInstitute.xsl"/>