diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl
index 65e6e1951..e68c96308 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl
@@ -48,7 +48,17 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="show-page-title">
-        <xsl:value-of select="foundry:title()"/>
+        <xsl:variable name="useCategoryMenu" 
+                      select="if(./@useCategoryMenu) 
+                              then ./@useCategoryMenu
+                              else 'categoryMenu'"/>
+        <xsl:variable name="useRootCategoryIndexItemTitle"
+                      select="if(./@useRootIndexItemCategoryTitle) 
+                              then foundry:boolean(./@useRootCategoryIndexItemTitle)
+                              else false()"/>
+
+        <xsl:value-of select="foundry:title($useCategoryMenu, 
+                                            $useRootCategoryIndexItemTitle)"/>
     </xsl:template>
     
     <foundry:doc section="user"
diff --git a/ccm-core/web/themes/foundry/foundry/lib/utils.xsl b/ccm-core/web/themes/foundry/foundry/lib/utils.xsl
index 86e0167b2..4d74e1fc1 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/utils.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/utils.xsl
@@ -946,6 +946,9 @@
     </xsl:function>
     
     <xsl:function name="foundry:title" as="xs:string">
+        <xsl:param name="useCategoryMenu"/>
+        <xsl:param name="useRootCategoryIndexItemTitle"/>
+
         <xsl:choose>
             <!-- Use fixed title for some special content items -->
             <xsl:when test="$data-tree//cms:contentPanel">
@@ -983,11 +986,11 @@
             <!-- Title for content section-->
             <xsl:otherwise>
                 <xsl:choose>
-                    <xsl:when test="$data-tree/nav:categoryMenu//nav:category[@isSelected='true']">
-                        <xsl:for-each select="$data-tree/nav:categoryMenu//nav:category[@isSelected='true']">
+                    <xsl:when test="$data-tree/nav:categoryMenu[@id=$useCategoryMenu]//nav:category[@isSelected='true']">
+                        <xsl:for-each select="$data-tree/nav:categoryMenu[@id=$useCategoryMenu]//nav:category[@isSelected='true']">
                             <xsl:choose>
                                 <!-- Special rule: Use content item title for root-page in navigation -->
-                                <xsl:when test="position() = last() and position() = 1">
+                                <xsl:when test="position() = last() and position() = 1 and $useRootCategoryIndexItemTitle">
                                     <xsl:choose>
                                         <xsl:when test="$data-tree//title">
                                             <xsl:variable name="page-title">
@@ -1174,4 +1177,4 @@
         
     </xsl:function>
     
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>