diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/language.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/language.xsl
index 3dc52162c..d914460e5 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/language.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/language.xsl
@@ -116,6 +116,7 @@
 
         <xsl:for-each select="$available-languages/language">
             <xsl:sort select="./@locale" />
+
             <xsl:apply-templates select="$language-layout-tree">
                 <xsl:with-param name="class"
                                 select="if (./@locale = $lang)
@@ -132,6 +133,12 @@
                         </xsl:otherwise>
                     </xsl:choose>
                 </xsl:with-param>
+                <xsl:with-param name="selected-language"
+                                tunnel="yes"
+                                select="$lang" />
+                <xsl:with-param name="current-language"
+                                tunnel="yes"
+                                select="./@locale" />
                 <xsl:with-param name="language-name"
                                 tunnel="yes"
                                 select="foundry:get-static-text('', concat('language/', ./@locale))"/>
@@ -153,4 +160,26 @@
         <xsl:value-of select="$language-name"/>
     </xsl:template>
 
+    <xsl:template match="if-selected-language">
+        <xsl:param name="current-language" 
+                   tunnel="yes" />
+        <xsl:param name="selected-language" 
+                   tunnel="yes" />
+
+       <xsl:if test="$current-language = $selected-language">
+            <xsl:apply-templates />
+        </xsl:if>
+    </xsl:template>
+
+    <xsl:template match="if-not-selected-language">
+        <xsl:param name="current-language" 
+                   tunnel="yes" />
+        <xsl:param name="selected-language" 
+                   tunnel="yes" />
+
+        <xsl:if test="$current-language != $selected-language">
+            <xsl:apply-templates />
+        </xsl:if>
+    </xsl:template>
+
 </xsl:stylesheet>