Submit button enabling revisited

diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index 28b2f42be081580b65c9c006de5e672864011554..475b6967ab57e41123bf88ff5b4eebf3b7e0d6aa 100644 (file)
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -84,9 +84,7 @@
     var email_disabled = document.forms["setup_form"]["email"].disabled;
     var email_value = document.forms["setup_form"]["email"].value;
     var prefix_value = document.forms["setup_form"]["openid_prefix"].value;
-    if (email_disabled == true) {
-      trigger = false;
-    } else if (email_value == null || email_value == "" || prefix_value == null || prefix_value == "") {
+    if ((email_disabled == false) && (email_value == null || email_value == "" || prefix_value == null || prefix_value == "")) {
       trigger = true;
     }