diff --git a/ccm-sci-bundle/web/themes/foundry/conf/global.xml b/ccm-sci-bundle/web/themes/foundry/conf/global.xml
index 090a8d949..0e37be814 100644
--- a/ccm-sci-bundle/web/themes/foundry/conf/global.xml
+++ b/ccm-sci-bundle/web/themes/foundry/conf/global.xml
@@ -13,6 +13,6 @@
     -->
     <!--<setting id="parent-theme">foundry</setting>-->
     
-    <setting id="site-logo">foundry/images/scientificcms_logo.png</setting>
+    <setting id="site-logo">images/scientificcms_logo.png</setting>
     
 </foundry:configuration>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/global-vars.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/global-vars.xsl
index 181b8b020..b4dc52ec0 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/global-vars.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/global-vars.xsl
@@ -190,9 +190,17 @@ processor, some are read from the configuration files of Foundry and some are de
     </foundry:doc>
     <xsl:param name="negotiated-language" select="'en'"/>
     
-    <!-- Temporary workaround until https://redmine.libreccm.org/issues/2186 is decided -->
     <xsl:variable name="lang">
-        <xsl:value-of select="$negotiated-language"/>
+        <xsl:choose>
+            <xsl:when test="document(foundry:gen-path('conf/global.xml'))/foundry:configuration/supported-languages/language[@locale=$negotiated-language]">
+                <xsl:value-of select="$negotiated-language"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="document(foundry:gen-path('conf/global.xml'))/foundry:configuration/supported-languages/language[@default='true']/@locale"/>
+            </xsl:otherwise>
+        </xsl:choose>
+        
+        
     </xsl:variable>
     
     <!--<foundry:doc section="devel">
diff --git a/ccm-sci-bundle/web/themes/foundry/images/scientificcms_logo.png b/ccm-sci-bundle/web/themes/foundry/images/scientificcms_logo.png
new file mode 100644
index 000000000..e3acc9efb
Binary files /dev/null and b/ccm-sci-bundle/web/themes/foundry/images/scientificcms_logo.png differ