diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-menus.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-menus.ftl
index 0cd78b2b0..df68bbd06 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-menus.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-menus.ftl
@@ -4,7 +4,6 @@
 
 <#import "lib-properties.ftl" as p>
 <#assign subjectUri = individual.controlPanelUrl()?split("=") >
-<#assign nameForOtherGroup = nameForOtherGroup!"other">
 
 <#if (propertyGroups.all)??>
     <#assign groups = propertyGroups.all>   
@@ -13,6 +12,7 @@
             <nav id="property-group-menu" role="navigation">
                 <ul role="list">
                     <#list groups as group>
+                      <#if (group.properties?size > 0) >
                         <#assign groupname = group.getName(nameForOtherGroup)>                        
                         <#if groupname?has_content>
                     		<#--create property group html id is the function that will replace all spaces with underscore to make a valid id-->
@@ -21,13 +21,15 @@
                             function to capitalize all except function words. -->
                             <li role="listitem"><a href="#${groupnameHtmlId}" title="${i18n().group_name}">${groupname?capitalize}</a></li>
                         </#if>
+                      </#if>
                     </#list>
                 </ul>
             </nav>
-        </#if> 
-    </#if>
+        </#if>
+      </#if>
 </#if>
 <#list propertyGroups.all as group>
+  <#if (group.properties?size > 0)>
     <#assign groupName = group.getName(nameForOtherGroup)>
     <#assign verbose = (verbosePropertySwitch.currentValue)!false>
     
@@ -50,4 +52,5 @@
         <#-- List the properties in the group -->
         <#include "individual-properties.ftl">
     </section> <!-- end property-group -->
+  </#if>
 </#list>
diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl
index bb9bd9dc8..2c8d83e27 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl
@@ -11,14 +11,14 @@
     <li  class="groupTabSpacer">&nbsp;</li>
 <#list propertyGroups.all as groupTabs>
     <#if ( groupTabs.properties?size > 0 ) >
-    <#assign groupName = groupTabs.getName(nameForOtherGroup)>
-    <#if groupName?has_content>
-		<#--the function replaces spaces in the name with underscores, also called for the property group menu-->
-    	<#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
-    <#else>
-        <#assign groupName = "${i18n().properties_capitalized}">
-    	<#assign groupNameHtmlId = "${i18n().properties}" >
-    </#if>
+        <#assign groupName = groupTabs.getName(nameForOtherGroup)>
+        <#if groupName?has_content>
+		    <#--the function replaces spaces in the name with underscores, also called for the property group menu-->
+    	    <#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
+        <#else>
+            <#assign groupName = "${i18n().properties_capitalized}">
+    	    <#assign groupNameHtmlId = "${i18n().properties}" >
+        </#if>
         <#if tabCount = 1 >
             <li class="selectedGroupTab clickable" groupName="${groupNameHtmlId}">${groupName?capitalize}</li>
             <li class="groupTabSpacer">&nbsp;</li>
@@ -35,30 +35,32 @@
 </#if>
 </ul>
 <#list propertyGroups.all as group>
-    <#assign groupName = group.getName(nameForOtherGroup)>
-    <#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
-    <#assign verbose = (verbosePropertySwitch.currentValue)!false>
-    <section id="${groupNameHtmlId}" class="property-group" role="region" style="<#if (sectionCount > 1) >display:none<#else>display:block</#if>">
-    <nav id="scroller" class="scroll-up hidden" role="navigation">
-        <a href="#branding" title="${i18n().scroll_to_menus}" >
-            <img src="${urls.images}/individual/scroll-up.gif" alt="${i18n().scroll_to_menus}" />
-        </a>
-    </nav>
+    <#if (group.properties?size > 0)>
+        <#assign groupName = group.getName(nameForOtherGroup)>
+        <#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
+        <#assign verbose = (verbosePropertySwitch.currentValue)!false>
+        <section id="${groupNameHtmlId}" class="property-group" role="region" style="<#if (sectionCount > 1) >display:none<#else>display:block</#if>">
+        <nav id="scroller" class="scroll-up hidden" role="navigation">
+            <a href="#branding" title="${i18n().scroll_to_menus}" >
+                <img src="${urls.images}/individual/scroll-up.gif" alt="${i18n().scroll_to_menus}" />
+            </a>
+        </nav>
     
-    <#-- Display the group heading --> 
-    <#if groupName?has_content>
-		<#--the function replaces spaces in the name with underscores, also called for the property group menu-->
-    	<#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
-        <h2 id="${groupNameHtmlId}" pgroup="tabs" class="hidden">${groupName?capitalize}</h2>
-    <#else>
-        <h2 id="properties" pgroup="tabs" class="hidden">${i18n().properties_capitalized}</h2>
-    </#if>
+        <#-- Display the group heading --> 
+        <#if groupName?has_content>
+		    <#--the function replaces spaces in the name with underscores, also called for the property group menu-->
+    	    <#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
+            <h2 id="${groupNameHtmlId}" pgroup="tabs" class="hidden">${groupName?capitalize}</h2>
+        <#else>
+            <h2 id="properties" pgroup="tabs" class="hidden">${i18n().properties_capitalized}</h2>
+        </#if>
         <div id="${groupNameHtmlId}Group" >
             <#-- List the properties in the group   -->
             <#include "individual-properties.ftl">
         </div>
-</section> <!-- end property-group -->
-<#assign sectionCount = 2 >
+        </section> <!-- end property-group -->
+        <#assign sectionCount = 2 >
+    </#if>
 </#list>
 <script>
     var individualLocalName = "${individual.localName}";