diff --git a/include/client/accesslink.inc.php b/include/client/accesslink.inc.php
index 9143186b8ed6ea92ce42790ea84ac437a0ebcbb8..46413f42bca3a09efc96a581d5cfbcad5f5facb1 100644
--- a/include/client/accesslink.inc.php
+++ b/include/client/accesslink.inc.php
@@ -50,7 +50,11 @@ else
 </form>
 <br>
 <p>
-<?php echo sprintf(
-__("If this is your first time contacting us or you've lost the ticket number, please %s open a new ticket %s"),
-    '<a href="open.php">','</a>'); ?>
+<?php
+if ($cfg->getClientRegistrationMode() != 'disabled'
+    || !$cfg->isClientLoginRequired()) {
+    echo sprintf(
+    __("If this is your first time contacting us or you've lost the ticket number, please %s open a new ticket %s"),
+        '<a href="open.php">','</a>');
+} ?>
 </p>
diff --git a/include/client/login.inc.php b/include/client/login.inc.php
index 5c6413f9b212dbc6d199859f3d2cdf70dccb129b..ac0746270525da374d44a4803cddb5db2b40cb7b 100644
--- a/include/client/login.inc.php
+++ b/include/client/login.inc.php
@@ -63,7 +63,9 @@ if ($cfg && $cfg->isClientRegistrationEnabled()) {
 </form>
 <br>
 <p>
-<?php if ($cfg && !$cfg->isClientLoginRequired()) {
+<?php
+if ($cfg->getClientRegistrationMode() != 'disabled'
+    || !$cfg->isClientLoginRequired()) {
     echo sprintf(__('If this is your first time contacting us or you\'ve lost the ticket number, please %s open a new ticket %s'),
         '<a href="open.php">', '</a>');
 } ?>
diff --git a/include/client/templates/sidebar.tmpl.php b/include/client/templates/sidebar.tmpl.php
index e3f15419e63894162ccfece5e99c3362910d6fda..88fb0bb2467f73509faffdeccf707089d7ad89dc 100644
--- a/include/client/templates/sidebar.tmpl.php
+++ b/include/client/templates/sidebar.tmpl.php
@@ -5,15 +5,17 @@ $BUTTONS = isset($BUTTONS) ? $BUTTONS : true;
 <?php if ($BUTTONS) { ?>
         <div class="front-page-button flush-right">
 <p>
+<?php
+    if ($cfg->getClientRegistrationMode() != 'disabled'
+        || !$cfg->isClientLoginRequired()) { ?>
             <a href="open.php" style="display:block" class="blue button"><?php
                 echo __('Open a New Ticket');?></a>
 </p>
-<?php   if ($cfg && !$cfg->isKnowledgebaseEnabled()) { ?>
+<?php } ?>
 <p>
             <a href="view.php" style="display:block" class="green button"><?php
                 echo __('Check Ticket Status');?></a>
 </p>
-<?php   } ?>
         </div>
 <?php } ?>
         <div class="content"><?php
diff --git a/open.php b/open.php
index 90bce8173998f9b67708bc81ec27220276df811a..a081c29c9bb47c4417432a1567e65d5d50fd8fd9 100644
--- a/open.php
+++ b/open.php
@@ -57,7 +57,10 @@ if ($_POST) {
 //page
 $nav->setActiveNav('new');
 if ($cfg->isClientLoginRequired()) {
-    if (!$thisclient) {
+    if ($cfg->getClientRegistrationMode() == 'disabled') {
+        Http::redirect('view.php');
+    }
+    elseif (!$thisclient) {
         require_once 'secure.inc.php';
     }
     elseif ($thisclient->isGuest()) {