diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
index bbb2cb894..31fa25321 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
@@ -4,7 +4,7 @@
 
 <#import "lib-form.ftl" as form>
 
-<#if dataInput?hasContent>
+<#if dataInput?has_content>
     <div class="pageBodyGroup">
         
         <h3>Data Input</h3>
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
index 3c7a3d2fe..db3b6af0c 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
@@ -9,17 +9,23 @@
         
         <ul>
             <#if siteConfig.urls.portals??>
-                <li><a href="${siteConfig.urls.siteInfo}">Current portal information</a></li>
+                <#if siteConfig.urls.siteInfo??>
+                    <li><a href="${siteConfig.urls.siteInfo}">Current portal information</a></li>
+                </#if>
                 <li><a href="${siteConfig.urls.portals}">List all portals</a></li>
             <#else>
-                <li><a href="${siteConfig.urls.siteInfo}">Site information</a></li>
+                <#if siteConfig.urls.siteInfo??>
+                    <li><a href="${siteConfig.urls.siteInfo}">Site information</a></li>
+                </#if>
             </#if>
             
             <#if siteConfig.urls.menuN3Editor??>
                 <li><a href="${siteConfig.urls.menuN3Editor}">Menu management</a></li>  
             </#if>
             
-            <li><a href="${siteConfig.urls.tabs}">Tab management</a></li>
+            <#if siteConfig.urls.tabs??>
+                <li><a href="${siteConfig.urls.tabs}">Tab management</a></li>
+            </#if>
             
             <#if siteConfig.urls.users??>
                 <li><a href="${siteConfig.urls.users}">User accounts</a></li>