diff --git a/src/Controller/UsersController.php b/src/Controller/UsersController.php
index 96eba19e4f..e211a98b34 100644
--- a/src/Controller/UsersController.php
+++ b/src/Controller/UsersController.php
@@ -84,8 +84,9 @@ public function login() {
         if ($isSsoEnabled === true) {
             $forceRedirectSsousersToLoginScreen = $SystemsettingsTable->getSystemsettingByKey('FRONTEND.SSO.FORCE_USER_TO_LOGINPAGE')->get('value') === '1';
             // Option for debugging purpose
-            if ($this->getRequest()->getQuery('disable_force_redirect_sso_users_to_login_screen', false) === 'true') {
+            if ($this->getRequest()->getQuery('disable_redirect', false) === 'true') {
                 $forceRedirectSsousersToLoginScreen = false;
+                $this->set('disableForceRedirectSsoUsers', true);
             }
         }
 
diff --git a/src/Template/Users/login.php b/src/Template/Users/login.php
index 170579f51c..5b42ec9c16 100644
--- a/src/Template/Users/login.php
+++ b/src/Template/Users/login.php
@@ -27,6 +27,7 @@
  * @var \App\View\AppView $this
  * @var bool $isSsoEnabled
  * @var bool $forceRedirectSsousersToLoginScreen
+ * @var bool $disableForceRedirectSsoUsers
  */
 
 $Logo = new \itnovum\openITCOCKPIT\Core\Views\Logo();
@@ -46,7 +47,7 @@ class="col-12 col-md-4 peer pX-40 pY-80 h-100 scrollable pos-r login-side-bg" st
 
     <h4 class="fw-300 c-white mB-40"><?= __('Login') ?></h4>
 
-    <?php if ($isSsoEnabled === true): ?>
+    <?php if ( ($disableForceRedirectSsoUsers === true) || ($isSsoEnabled === true) ): ?>
         <div class="form-group">
             <a
                     id="sso-redirect-href"
diff --git a/webroot/js/login/UsersLoginController.js b/webroot/js/login/UsersLoginController.js
index c90fe83df3..2507e11754 100644
--- a/webroot/js/login/UsersLoginController.js
+++ b/webroot/js/login/UsersLoginController.js
@@ -53,7 +53,7 @@ loginApp.controller("UsersLoginController", function($scope, $http, $httpParamSe
         $http.get("/users/login.json",
             {
                 params: {
-                    disable_force_redirect_sso_users_to_login_screen: disable_force_redirect_sso_users_to_login_screen
+                    disable_redirect: disable_force_redirect_sso_users_to_login_screen
                 }
             }
         ).then(function(result){