diff --git a/apps/users/utils.py b/apps/users/utils.py
index d75a8d761..006fbc3dd 100644
--- a/apps/users/utils.py
+++ b/apps/users/utils.py
@@ -230,24 +230,19 @@ class LoginIpBlockUtil(BlockGlobalIpUtilBase):
     BLOCK_KEY_TMPL = "_LOGIN_BLOCK_{}"
 
 
-def validate_email(addr):
-    addr = addr or ''
+def validate_emails(emails):
     pattern = r'^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$'
-    if re.match(pattern, addr):
-        return addr
-    else:
-        return ''
+    for e in emails:
+        e = e or ''
+        if re.match(pattern, e):
+            return e
 
 
 def construct_user_email(username, email, email_suffix=''):
-    email = validate_email(email)
-    if not email:
-        email = validate_email(username)
-
-        if not email:
-            email_suffix = email_suffix or settings.EMAIL_SUFFIX
-            email = f'{username}@{email_suffix}'
-    return email
+    default = f'{username}@{email_suffix or settings.EMAIL_SUFFIX}'
+    emails = [email, username]
+    email = validate_emails(emails)
+    return email or default
 
 
 def get_current_org_members():