diff --git a/productMods/edit/forms/js/customFormWithAutocomplete.js b/productMods/edit/forms/js/customFormWithAutocomplete.js
index 93f8dacc..bc6ff1ad 100644
--- a/productMods/edit/forms/js/customFormWithAutocomplete.js
+++ b/productMods/edit/forms/js/customFormWithAutocomplete.js
@@ -145,6 +145,7 @@ var customForm = {
         } else if (this.typeSelector.length) {
             this.typeSelector.val() ? this.acSelectorWrapper.show() : this.hideFields(this.acSelectorWrapper);
         }
+
     },
     
     initFormWithValidationErrors: function() {
@@ -173,7 +174,13 @@ var customForm = {
 
             // Reinitialize view. If no type selection in a two-step form, go back to type view;
             // otherwise, reinitialize full view.
-            (!typeVal.length && customForm.formSteps > 1) ? customForm.initFormTypeView() : customForm.initFormFullView();
+			if (!typeVal.length && customForm.formSteps > 1) {
+				customForm.initFormTypeView();
+			}
+			else {
+				customForm.initFormFullView();
+				customForm.acSelector.focus();
+			}
         }); 
         
         this.verifyMatch.click(function() {
diff --git a/productMods/edit/forms/personHasPositionHistory.jsp b/productMods/edit/forms/personHasPositionHistory.jsp
index 56ded7b5..86d656eb 100644
--- a/productMods/edit/forms/personHasPositionHistory.jsp
+++ b/productMods/edit/forms/personHasPositionHistory.jsp
@@ -166,8 +166,6 @@
         <c:set var="startYearRequiredHint" value="${requiredHint}" />
 <%  } %> 
 
-
-
 <c:set var="editjson" scope="request">
   {
     "formUrl" : "${formUrl}",