diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UserRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UserRetryController.java
index 4067d8593..b6bd1ef11 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UserRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UserRetryController.java
@@ -175,10 +175,11 @@ public class UserRetryController extends BaseEditController {
             request.setAttribute("formOnSubmit", "return validatePw(this);");
             request.setAttribute("formOnCancel", "forceCancel(this.form);");
         }
-        else {
+       else {
             request.setAttribute("formOnSubmit", "return validateUserFields(this);");
-            request.setAttribute("formOnCancel", "forceCancel(this.form);");
+            request.setAttribute("formOnCancel", "forceCancelTwo(this.form);");
         }
+
         request.setAttribute("formJsp","/templates/edit/specific/user_retry.jsp");
         request.setAttribute("scripts","/templates/edit/specific/user_retry_head.jsp");
         request.setAttribute("title","User Account Editing Form");
diff --git a/webapp/web/templates/edit/specific/user_retry_head.jsp b/webapp/web/templates/edit/specific/user_retry_head.jsp
index 0919f2ad3..957431c5e 100644
--- a/webapp/web/templates/edit/specific/user_retry_head.jsp
+++ b/webapp/web/templates/edit/specific/user_retry_head.jsp
@@ -2,14 +2,24 @@
 
 <script language="JavaScript" type="text/javascript">
 <!--
- 
+     var bypassValidateUF = false;
+     
      function forceCancel(theForm) {           // we don't want validation to stop us if we're canceling
          theForm.Md5password.value = "CANCEL"; // a dummy string to force validation to succeed
          theForm.passwordConfirmation.value = theForm.Md5password.value;
+         bypassValidateUF = true;
+         return true;
+     }
+
+     function forceCancelTwo(theForm) {           // called when there are no password fields displayed
+         bypassValidateUF = true;
          return true;
      }
 
      function validateUserFields(theForm) {
+         if ( bypassValidateUF ) {
+             return true;
+         }
          if (theForm.Username.value.length == 0 ) {
              alert("Please enter a valid Email address.");
              theForm.Username.focus();
@@ -32,10 +42,8 @@
 
      function validatePw(theForm) {
 
-         if ( theForm.Md5password.value != "CANCEL") {
-             if ( !validateUserFields(theForm) ) {
+         if ( !validateUserFields(theForm) ) {
                  return false;
-             }
          }
          if (theForm.Md5password.value.length == 0 ) {
              alert("Please enter a password.");
@@ -58,8 +66,14 @@
      }
 
     function confirmDelete() {
+        bypassValidateUF = true;
         var msg="Are you SURE you want to delete this user? If in doubt, CANCEL."
-        return confirm(msg);
+        var answer = confirm(msg)
+        if ( answer ) 
+                return true;
+        else
+                bypassValidateUF = false;
+                return false;
     }
 
 -->