1 files changed, 9 insertions, 6 deletions

diff --git a/editusers.cgi b/editusers.cgi
index bada71af7..56c0a7635 100755
--- a/editusers.cgi
+++ b/editusers.cgi
@@ -169,9 +169,10 @@ if ($action eq 'search') {
 
     # Validity checks
     $login || ThrowUserError('user_login_required');
-    check_email_syntax($login);
-    is_available_username($login) || ThrowUserError('account_exists',
-                                                    {'email' => $login});
+    validate_email_syntax($login)
+      || ThrowUserError('illegal_email_address', {addr => $login});
+    is_available_username($login)
+      || ThrowUserError('account_exists', {email => $login});
     ValidatePassword($password);
 
     # Login and password are validated now, and realname and disabledtext
@@ -245,9 +246,11 @@ if ($action eq 'search') {
         if ($login ne $loginold) {
             # Validate, then trick_taint.
             $login || ThrowUserError('user_login_required');
-            check_email_syntax($login);
-            is_available_username($login) || ThrowUserError('account_exists',
-                                                            {'email' => $login});
+            validate_email_syntax($login)
+              || ThrowUserError('illegal_email_address', {addr => $login});
+            is_available_username($login)
+              || ThrowUserError('account_exists', {email => $login});
+
             trick_taint($login);
             push(@changedFields, 'login_name');
             push(@values, $login);