diff --git a/ccm-cms/web/themes/freemarker/ccm-cms/orgaunit.ftl b/ccm-cms/web/themes/freemarker/ccm-cms/orgaunit.ftl
index 366526836..ebe490230 100644
--- a/ccm-cms/web/themes/freemarker/ccm-cms/orgaunit.ftl
+++ b/ccm-cms/web/themes/freemarker/ccm-cms/orgaunit.ftl
@@ -27,9 +27,21 @@
 
 <#function getSelectedTab item>
 
-    <#assign selectedTab=item["./orgaUnitTabs/availableTabs/*[@selected='true']/@label"]>
+    <#--  <#assign selectedTab=item["./orgaUnitTabs/availableTabs/*[@selected='true']/@label"]>
 
-    <#return item["./tab[@name='${selectedTab}']"]>
+    <#return item["./tab[@name='${selectedTab}']"]>  -->
+
+    <#return item["./orgaUnitTabs/selectedTab/*"]
+</#function>
+
+<#function getTypeOfSelectedTab item>
+
+    <#assign nodeName = item["./orgaUnitTabs/selectedTab/*"]?node_name>
+    <#if (nodeName == "text")>
+        <#return item["./orgaUnitTabs/selectedTab/text/@key"]>
+    <#else>
+        <#return nodeName>
+    </#if>
 </#function>
 
 <#function getPropertyFromTab tab name>