diff --git a/include/staff/settings-access.inc.php b/include/staff/settings-access.inc.php
index 753d8ca43098d4f144d5f09523243c099447fd6a..08c8836a0d8f7deef7f1e64663a1d5e01a6e4ce6 100644
--- a/include/staff/settings-access.inc.php
+++ b/include/staff/settings-access.inc.php
@@ -97,7 +97,6 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
 <?php foreach (array(
     'disabled' => 'Disabled — All users are guests',
     'public' => 'Public — Anyone can register',
-    'auto' => 'Automatic — Create new accounts for all new tickets',
     'closed' => 'Private — Only staff can register clients',)
     as $key=>$val) { ?>
         <option value="<?php echo $key; ?>" <?php
diff --git a/open.php b/open.php
index 6bcecf5e513ca0fa3f1457cb3b3319818e8cb894..12be34b539acb6bf9a932cf33a52780b8d6953bf 100644
--- a/open.php
+++ b/open.php
@@ -64,8 +64,14 @@ if ($_POST) {
 
 //page
 $nav->setActiveNav('new');
-if ($cfg->isClientLoginRequired() && !$thisclient) {
-    require_once 'secure.inc.php';
+if ($cfg->isClientLoginRequired()) {
+    if (!$thisclient) {
+        require_once 'secure.inc.php';
+    }
+    elseif ($thisclient->isGuest()) {
+        require_once 'login.php';
+        exit();
+    }
 }
 
 require(CLIENTINC_DIR.'header.inc.php');