diff --git a/public/include/config/global.inc.dist.php b/public/include/config/global.inc.dist.php
index 8f28e8df..cf67a425 100644
--- a/public/include/config/global.inc.dist.php
+++ b/public/include/config/global.inc.dist.php
@@ -39,7 +39,6 @@ $config = array(
     'theme' => 'mmcFE',             // Overall default theme
     'mobile' => true,               // Allow overwriting theme for mobile devices
     'mobile_theme' => 'mobile',     // Set default or custom mobile theme
-    'registration' => true,         // Allow new users to register
     'name' => 'The Pool',
     'slogan' => 'Resistance is futile',
     'email' => 'test@example.com',  // Mail address used for notifications
diff --git a/public/include/pages/admin/settings.inc.php b/public/include/pages/admin/settings.inc.php
index ecea2d02..d831d024 100644
--- a/public/include/pages/admin/settings.inc.php
+++ b/public/include/pages/admin/settings.inc.php
@@ -18,7 +18,8 @@ if ($_REQUEST['do'] == 'save' && !empty($_REQUEST['data'])) {
 
 // Fetch settings to propagate to template
 $smarty->assign("MAINTENANCE", $setting->getValue('maintenance'));
-$smarty->assign("REGISTRATION", $setting->getValue('registration'));
+var_dump($setting->getValue('lock_registration'));
+$smarty->assign("LOCKREGISTRATION", $setting->getValue('lock_registration'));
 
 // Tempalte specifics
 $smarty->assign("CONTENT", "default.tpl");
diff --git a/public/include/pages/register.inc.php b/public/include/pages/register.inc.php
index 0d3df916..d47c67ed 100644
--- a/public/include/pages/register.inc.php
+++ b/public/include/pages/register.inc.php
@@ -3,7 +3,7 @@
 // Make sure we are called from index.php
 if (!defined('SECURITY')) die('Hacking attempt');
 
-if (!$config['website']['registration'] || !$setting->getValue('registration')) {
+if ($setting->getValue('lock_registration')) {
   $_SESSION['POPUP'][] = array('CONTENT' => 'Account registration is currently disabled. Please try again later.', 'TYPE' => 'errormsg');
   $smarty->assign("CONTENT", "disabled.tpl");
 } else {
diff --git a/public/include/pages/register/register.inc.php b/public/include/pages/register/register.inc.php
index 063c5cc4..01a27e10 100644
--- a/public/include/pages/register/register.inc.php
+++ b/public/include/pages/register/register.inc.php
@@ -17,9 +17,9 @@ if ($config['recaptcha']['enabled']) {
 if($config['recaptcha']['enabled'] && $_POST["recaptcha_response_field"] && $_POST["recaptcha_response_field"]!=''){
   if ($rsp->is_valid) {
     $smarty->assign("RECAPTCHA", recaptcha_get_html($config['recaptcha']['public_key']));
-    if (!$config['website']['registration'] || !$setting->getValue('registration')) {
+    if ($setting->getValue('lock_registration')) {
       $_SESSION['POPUP'][] = array('CONTENT' => 'Account registration is currently disabled. Please try again later.', 'TYPE' => 'errormsg');
-    } else if ($user->register($_POST['username'], $_POST['password1'], $_POST['password2'], $_POST['pin'], $_POST['email1'], $_POST['email2']) && ($config['website']['registration'] || $setting->getValue('registration'))) {
+    } else if ($user->register($_POST['username'], $_POST['password1'], $_POST['password2'], $_POST['pin'], $_POST['email1'], $_POST['email2']) && !$setting->getValue('lock_registration')) {
       $_SESSION['POPUP'][] = array('CONTENT' => 'Account created, please login');
     } else {
       $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to create account: ' . $user->getError(), 'TYPE' => 'errormsg');
@@ -34,9 +34,9 @@ if($config['recaptcha']['enabled'] && $_POST["recaptcha_response_field"] && $_PO
   $_SESSION['POPUP'][] = array('CONTENT' => 'Empty Captcha, please try again.', 'TYPE' => 'errormsg');
 // Captcha disabled
 } else {
-  if (!$config['website']['registration'] || !$setting->getValue('registration')) {
+  if ($setting->getValue('lock_registration')) {
     $_SESSION['POPUP'][] = array('CONTENT' => 'Account registration is currently disabled. Please try again later.', 'TYPE' => 'errormsg');
-  } else if ($user->register($_POST['username'], $_POST['password1'], $_POST['password2'], $_POST['pin'], $_POST['email1'], $_POST['email2']) && $config['website']['registration']) {
+  } else if ($user->register($_POST['username'], $_POST['password1'], $_POST['password2'], $_POST['pin'], $_POST['email1'], $_POST['email2']) && !$setting->getValue('lock_registration')) {
     $_SESSION['POPUP'][] = array('CONTENT' => 'Account created, please login');
   } else {
     $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to create account: ' . $user->getError(), 'TYPE' => 'errormsg');
diff --git a/public/templates/mmcFE/admin/settings/default.tpl b/public/templates/mmcFE/admin/settings/default.tpl
index f7bca77e..3cd67f4e 100644
--- a/public/templates/mmcFE/admin/settings/default.tpl
+++ b/public/templates/mmcFE/admin/settings/default.tpl
@@ -13,12 +13,22 @@
       <tr>
         <td class="left">Maintenance Mode</td>
         <td class="center"><span id='tt'><img src='{$PATH}/images/questionmark.png' height='15px' width='15px' title='Enable Maintenance Mode for mmcfe-ng. Only admins can login.'></span></td>
-        <td><select name="data[maintenance]"><option value="1">Yes</option><option value="0"{if !$MAINTENANCE} selected{/if}>No</option></select></td>
+        <td>
+          <select name="data[maintenance]">
+            <option value="1">Yes</option>
+            <option value="0"{if !$MAINTENANCE} selected{/if}>No</option>
+          </select>
+        </td>
       </tr>
       <tr>
-        <td class="left">User Registration</td>
+        <td class="left">Disable Registration</td>
         <td class="center"><span id='tt'><img src='{$PATH}/images/questionmark.png' height='15px' width='15px' title='Enable or disable new account registration. Can also be done via configuration option.'></span></td>
-        <td><select name="data[registration]"><option value="1">Yes</option><option value="0"{if !$REGISTRATION} selected{/if}>No</option></select></td>
+        <td>
+          <select name="data[lock_registration]">
+            <option value="1">Yes</option>
+            <option value="0"{if !$LOCKREGISTRATION} selected{/if}>No</option>
+          </select>
+        </td>
       </tr>
       <tr><td class="center" colspan="3"><input type="submit" value="Save" class="submit small" /></td></tr>
     </tbody>