diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java
index f0e4fd6d3..a10c2a540 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java
@@ -125,7 +125,7 @@ public class IndividualController extends FreemarkerHttpServlet {
     		body.put("relatedSubject", getRelatedSubject(vreq));
     		body.put("namespaces", namespaces);
     		body.put("temporalVisualizationEnabled", getTemporalVisualizationFlag());
-    		body.put("verbosePropertyForm", getVerbosePropertyValues(vreq));
+    		body.put("verbosePropertyForm", getVerbosePropertyFormValues(vreq));
     		
     		IndividualTemplateModel itm = getIndividualTemplateModel(vreq, individual);
     		/* We need to expose non-getters in displaying the individual's property list, 
@@ -154,7 +154,7 @@ public class IndividualController extends FreemarkerHttpServlet {
 	    EditSubmission.clearAllEditSubmissionsInSession(session);
     }
     
-    private Map<String, Object> getVerbosePropertyValues(VitroRequest vreq) {
+    private Map<String, Object> getVerbosePropertyFormValues(VitroRequest vreq) {
         
         Map<String, Object> map = null;
         
diff --git a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
index 77ebf4bf8..e0c12a315 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
@@ -82,8 +82,9 @@ we need to also show the property label. If no label is specified, the property
 name will be used as the label. -->
 <#macro addLinkWithLabel property editable label="${property.name?capitalize}" extraParams="">
     <#local addLink><@addLink property editable label extraParams /></#local>
-    <#if addLink?has_content>
-        <h2 id="${property.localName}">${label} ${addLink} <@verboseDisplay property /></h2>         
+    <#local verboseDisplay><@verboseDisplay property /></#local>
+    <#if addLink?has_content || verboseDisplay?has_content>
+        <h2 id="${property.localName}">${label} ${addLink!} ${verboseDisplay!}</h2>         
     </#if>
 </#macro>