diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index 87020299..985afa90 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -805,6 +805,15 @@
     <url-pattern>/manageGrants</url-pattern>
   </servlet-mapping>
 
+  <servlet>
+    <servlet-name>ManageLabelsForIndividualController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ManageLabelsForIndividualController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>ManageLabelsForIndividualController</servlet-name>
+    <url-pattern>/manageLabels</url-pattern>
+  </servlet-mapping>
+
   <servlet>
     <servlet-name>ManagePublicationsForIndividualController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ManagePublicationsForIndividualController</servlet-class>
diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
index 15beb668..51cc3de1 100644
--- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
+++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
@@ -4,7 +4,9 @@
 <#include "individual-setup.ftl">
 <#import "individual-qrCodeGenerator.ftl" as qr>
 <#import "lib-vivo-properties.ftl" as vp>
-
+<#if !labelCount??>
+    <#assign labelCount = 0 >
+</#if>
 <section id="individual-intro" class="vcard person" role="region">
 
     <section id="share-contact" role="region"> 
@@ -65,7 +67,7 @@
             <#else>                
                 <h1 class="vcard foaf-person">
                     <#-- Label -->
-                    <span class="fn"><@p.label individual editable /></span>
+                    <span class="fn"><@p.label individual editable labelCount/></span>
 
                     <#--  Display preferredTitle if it exists; otherwise mostSpecificTypes -->
                     <#assign title = propertyGroups.pullProperty("${core}preferredTitle")!>