diff --git a/public/include/pages/register.inc.php b/public/include/pages/register.inc.php
index 9b338b51..2866a4b6 100644
--- a/public/include/pages/register.inc.php
+++ b/public/include/pages/register.inc.php
@@ -3,9 +3,12 @@
 // Make sure we are called from index.php
 if (!defined('SECURITY')) die('Hacking attempt');
 
-if ($setting->getValue('lock_registration') && !$config['accounts']['invitations']['enabled']) {
+if ($setting->getValue('lock_registration') && $setting->getValue('disable_invitations')) {
   $_SESSION['POPUP'][] = array('CONTENT' => 'Account registration is currently disabled. Please try again later.', 'TYPE' => 'errormsg');
   $smarty->assign("CONTENT", "disabled.tpl");
+} else if (!$setting->getValue('disable_invitations') && !isset($_GET['token'])) {
+  $_SESSION['POPUP'][] = array('CONTENT' => 'Only invited users are allowed to register.', 'TYPE' => 'errormsg');
+  $smarty->assign("CONTENT", "disabled.tpl");
 } else {
   if ($config['recaptcha']['enabled']) {
     require_once(INCLUDE_DIR . '/lib/recaptchalib.php');
diff --git a/public/include/pages/register/register.inc.php b/public/include/pages/register/register.inc.php
index 9e438853..560961f6 100644
--- a/public/include/pages/register/register.inc.php
+++ b/public/include/pages/register/register.inc.php
@@ -15,6 +15,8 @@ if ($config['recaptcha']['enabled']) {
 
 if ($setting->getValue('disable_invitations') && $setting->getValue('lock_registration')) {
   $_SESSION['POPUP'][] = array('CONTENT' => 'Account registration is currently disabled. Please try again later.', 'TYPE' => 'errormsg');
+} else if (!$setting->getValue('disable_invitations') && !isset($_POST['token'])) {
+  $_SESSION['POPUP'][] = array('CONTENT' => 'Only invited users are allowed to register.', 'TYPE' => 'errormsg');
 } else {
   // Check if recaptcha is enabled, process form data if valid
   if($config['recaptcha']['enabled'] && $_POST["recaptcha_response_field"] && $_POST["recaptcha_response_field"]!=''){