Bug 254758 creating an account that doesn't match the create email regexp should not say "New accounts must be created by an administrator."

r=lpsolit a=lpsolit

2 files changed, 12 insertions, 3 deletions

diff --git a/createaccount.cgi b/createaccount.cgi
index 1f372fe7e..1ec7ec31d 100755
--- a/createaccount.cgi
+++ b/createaccount.cgi
@@ -64,7 +64,7 @@ if (defined($login)) {
     $vars->{'login'} = $login;
 
     if ($login !~ /$createexp/) {
-        ThrowUserError("account_creation_disabled");
+        ThrowUserError("account_creation_restricted");
     }
 
     # Create and send a token for this new account.
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 3f82c1c92..79817e881 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -48,9 +48,18 @@
 [% error_message = BLOCK %]
   [% IF    error == "account_creation_disabled" %]
     [% title = "Account Creation Disabled" %]
-    User account creation has been disabled or restricted.
+    User account creation has been disabled.
     <hr>
-    New accounts must be created by an administrator.
+    New accounts must be created by an administrator. The
+    maintainer is [% Param("maintainer") %].
+
+  [% ELSIF error == "account_creation_restricted" %]
+    [% title = "Account Creation Restricted" %]
+    User account creation has been restricted.
+    <hr>
+    Contact your administrator or the maintainer
+    ([% Param("maintainer") %]) for information about
+    creating an account.
 
   [% ELSIF error == "account_disabled" %]
     [% title = "Account Disabled" %]