1 files changed, 2 insertions, 1 deletions
diff --git a/httemplate/elements/validate_password.html b/httemplate/elements/validate_password.html
index 4057f5d3f..73c0db281 100644
--- a/httemplate/elements/validate_password.html
+++ b/httemplate/elements/validate_password.html
@@ -29,7 +29,7 @@ function add_password_validation (fieldid, submitid) {
     // some browsers allow the enter key to submit a form even if the submit button is disabled
     // below prevents enter key from submiting form if password has not been validated.
     if (key == '13') {
-      var check = checkPasswordValidation();
+      var check = checkPasswordValidation(fieldid);
       return check;
     }
   }
@@ -61,6 +61,7 @@ function add_password_validation (fieldid, submitid) {
       );
     } else {
       resultfield.innerHTML = '';
+      if (submitid){ document.getElementById(submitid).disabled = false; }
     }
   };
 }