From 0356e4dde977c0eadf4626b4f0d6b657050df5c2 Mon Sep 17 00:00:00 2001
From: tlw72 <tlw72@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 14 Jan 2011 18:55:35 +0000
Subject: [PATCH] NIHVIVO-1705: fix for user account required fields

---
 .../templates/edit/specific/user_retry_head.jsp    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/webapp/web/templates/edit/specific/user_retry_head.jsp b/webapp/web/templates/edit/specific/user_retry_head.jsp
index c82c09d44..636e04770 100644
--- a/webapp/web/templates/edit/specific/user_retry_head.jsp
+++ b/webapp/web/templates/edit/specific/user_retry_head.jsp
@@ -9,7 +9,7 @@
          return true;
      }
 
-     function validatePw(theForm) {
+     function validateUserFields(theForm) {
          if (theForm.Username.value.length == 0 ) {
              alert("Please enter a valid Email address.");
              theForm.Username.focus();
@@ -24,6 +24,16 @@
              alert("Please enter a Last Name.");
              theForm.LastName.focus();
              return false;
+         }
+		 else {    
+             return true;
+         }
+     }
+
+     function validatePw(theForm) {
+
+         if ( !validateUserFields(theForm) ) {
+             return false;
          }
          if (theForm.Md5password.value.length == 0 ) {
              alert("Please enter a password.");
@@ -40,7 +50,7 @@
              theForm.Md5password.focus();
              return false;
          } 
-		 else {    
+ 		 else {    
              return true;
          }
      }