diff --git a/CTFd/auth.py b/CTFd/auth.py
index f261f253..739558ea 100644
--- a/CTFd/auth.py
+++ b/CTFd/auth.py
@@ -265,11 +265,7 @@ def register():
         if not valid_email:
             errors.append("Please enter a valid email address")
         if email.check_email_is_whitelisted(email_address) is False:
-            errors.append(
-                "Only email addresses under {domains} may register".format(
-                    domains=get_config("domain_whitelist")
-                )
-            )
+            errors.append("Your email address is not from an allowed domain")
         if names:
             errors.append("That user name is already taken")
         if team_name_email_check is True:
diff --git a/CTFd/schemas/users.py b/CTFd/schemas/users.py
index 3ea21db2..1c0dde7a 100644
--- a/CTFd/schemas/users.py
+++ b/CTFd/schemas/users.py
@@ -150,9 +150,7 @@ class UserSchema(ma.ModelSchema):
                     )
                 if check_email_is_whitelisted(email) is False:
                     raise ValidationError(
-                        "Only email addresses under {domains} may register".format(
-                            domains=get_config("domain_whitelist")
-                        ),
+                        "Email address is not from an allowed domain",
                         field_names=["email"],
                     )
                 if get_config("verify_emails"):