diff --git a/productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl b/productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
index 854899b1..11caa3f9 100644
--- a/productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
+++ b/productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
@@ -124,7 +124,7 @@
   </p>
   <div class="acSelection" acGroupName="conference">
       <p class="inline">
-          <label>Selected Conference:</label>
+          <label>Selected conference:</label>
           <span class="acSelectionInfo"></span>
           <a href="" class="verifyMatch"  title="verify match">(Verify this match</a> or 
           <a href="#" class="changeSelection" id="changeSelection">change selection)</a>
diff --git a/productMods/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js b/productMods/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js
index 55a215ad..ecc1e32a 100644
--- a/productMods/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js
+++ b/productMods/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js
@@ -391,12 +391,15 @@ var customForm = {
         // If the form has a type selector, add type name to label in add mode. In edit mode, use typeSelectorSpan
         // html. The second case is an "else if" and not an else because the template may not be passing the label
         // to the acSelection macro or it may not be using the macro at all and the label is hard-coded in the html.
-        if (this.typeSelector.length) {
+        if ( this.typeSelector.length && ($acDiv.attr('acGroupName') == this.typeSelector.attr('acGroupName')) ) {
              $acDiv.find('label').html('Selected ' + this.typeName + ':');
         }
-        else if ( this.typeSelectorSpan.html() ) {
+        else if ( this.typeSelectorSpan.html() && ($acDiv.attr('acGroupName') == this.typeSelectorInput.attr('acGroupName')) ) {
             $acDiv.find('label').html('Selected ' + this.typeSelectorSpan.html() + ':');
         }
+        else if ( $acDiv.find('label').html() == '' ) {
+            $acDiv.find('label').html('Selected ' + this.multipleTypeNames[$(selectedObj).attr('acGroupName')] + ':');
+        }
         
         $acDiv.show();
         $acDiv.find("input").val(uri);