Merge branch 'testing' into 0.9.x

1 files changed, 7 insertions, 3 deletions

diff --git a/actions/login.php b/actions/login.php
index 8ea3c800b..dc6352368 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -267,9 +267,13 @@ class LoginAction extends Action
                      'user name and password ' .
                      'before changing your settings.');
         } else {
-            return _('Login with your username and password. ' .
-                     'Don\'t have a username yet? ' .
-                     '[Register](%%action.register%%) a new account.');
+            $prompt = _('Login with your username and password.');
+            if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) {
+                $prompt .= ' ';
+                $prompt .= _('Don\'t have a username yet? ' .
+                             '[Register](%%action.register%%) a new account.');
+            }
+            return $prompt;
         }
     }