diff --git a/src/core/controllers/AuthenticationController.php b/src/core/controllers/AuthenticationController.php
index d0591b4dfc796f6b5784c2a2d8e987da8bd1a066..d5959923e3b0cda42e87721db4917cf110c7a084 100755
--- a/src/core/controllers/AuthenticationController.php
+++ b/src/core/controllers/AuthenticationController.php
@@ -27,7 +27,15 @@ class AuthenticationController
         $userId = null;
         if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) {
             if (AuthenticationModel::authentication(['userId' => $_SERVER['PHP_AUTH_USER'], 'password' => $_SERVER['PHP_AUTH_PW']])) {
-                $userId = $_SERVER['PHP_AUTH_USER'];
+                $loginMethod = CoreConfigModel::getLoggingMethod();
+                if ($loginMethod['id'] != 'standard') {
+                    $user = UserModel::getByLogin(['select' => ['loginmode'], 'userId' => $_SERVER['PHP_AUTH_USER']]);
+                    if ($user['loginmode'] == 'restMode') {
+                        $userId = $_SERVER['PHP_AUTH_USER'];
+                    }
+                } else {
+                    $userId = $_SERVER['PHP_AUTH_USER'];
+                }
             }
         } else {
             $cookie = AuthenticationModel::getCookieAuth();