diff --git a/productMods/edit/forms/js/customFormWithAutocomplete.js b/productMods/edit/forms/js/customFormWithAutocomplete.js
index 936c86cc..8ada5c74 100644
--- a/productMods/edit/forms/js/customFormWithAutocomplete.js
+++ b/productMods/edit/forms/js/customFormWithAutocomplete.js
@@ -107,7 +107,7 @@ var customForm = {
         }
         else if (this.findValidationErrors()) {
             this.initFormWithValidationErrors();
-        } else if(this.supportEdit && this.editMode == 'edit') {
+        } else if(this.supportEdit) {
         	this.initFormWithSupportEdit();
         }
         // If type is already selected when the page loads (Firefox retains value
@@ -176,11 +176,15 @@ var customForm = {
        
     },
     initFormWithSupportEdit: function() {
-       this.initFormWithValidationErrors();
-       //Hide verify match when edit mode
-       this.verifyMatch.hide();
+    	if(this.editMode == 'edit') {
+    		this.initFormWithValidationErrors();
+    		//Hide verify match when edit mode
+    		this.verifyMatch.hide();
+    	} else {
+    		 this.initFormFullView();
+    	}
        //Disable submit button until selection made
-       this.button.attr('disabled', true);
+       this.button.attr('disabled', 'disabled');
     },
     
     // Bind event listeners that persist over the life of the page. Event listeners
@@ -407,7 +411,7 @@ var customForm = {
             
             //Resetting so disable submit button again for object property autocomplete
             if(this.supportEdit) {
-            	this.button.attr('disabled', true);
+            	//this.button.attr('disabled', 'disabled');
             }
            
         }      
diff --git a/productMods/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl b/productMods/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
index 04193f4b..c8ea8e49 100644
--- a/productMods/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
+++ b/productMods/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
@@ -58,7 +58,8 @@
             
             
             <p>
-                <input type="submit" id="submit" value="${editConfiguration.submitLabel}" role="button "/>
+                <input type="submit" id="submit" value="${editConfiguration.submitLabel}" role="button" disabled="disabled"/>
+           
                 <span class="or"> or </span>
                 <a title="Cancel" class="cancel" href="${cancelUrl}">Cancel</a>
             </p>