diff --git a/dev/Common/Links.js b/dev/Common/Links.js
index 3a16ba2a8..525169078 100644
--- a/dev/Common/Links.js
+++ b/dev/Common/Links.js
@@ -5,7 +5,7 @@ const
 	BASE = doc.location.pathname.replace(/\/+$/,'') + '/',
 	HASH_PREFIX = '#/',
 
-	adminPath = () => rl.adminArea() && !Settings.app('adminHostUse'),
+	adminPath = () => rl.adminArea() && !Settings.app('adminHost'),
 
 	prefix = () => BASE + '?' + (adminPath() ? Settings.app('adminPath') : '');
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
index ed5ad4fd4..9cc3dc98f 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -613,7 +613,7 @@ class Actions
 					'webPath' => \RainLoop\Utils::WebPath(),
 					'webVersionPath' => \RainLoop\Utils::WebVersionPath()
 				), $bAdmin ? array(
-					'adminHostUse' => '' !== $oConfig->Get('security', 'admin_panel_host', ''),
+					'adminHost' => '' !== $oConfig->Get('security', 'admin_panel_host', ''),
 					'adminPath' => $oConfig->Get('security', 'admin_panel_key', '') ?: 'admin',
 					'adminAllowed' => (bool)$oConfig->Get('security', 'allow_admin_panel', true)
 				) : array()
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
index a71766f79..131068985 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
@@ -84,13 +84,12 @@ abstract class Service
 
 		$aPaths = \explode('/', $sQuery);
 
-		$bAdmin = false;
-		$sAdminPanelHost = $oConfig->Get('security', 'admin_panel_host', '');
+		$sAdminPanelHost = \trim($oConfig->Get('security', 'admin_panel_host', ''));
 		if (empty($sAdminPanelHost)) {
 			$bAdmin = !empty($aPaths[0]) && ($oConfig->Get('security', 'admin_panel_key', '') ?: 'admin') === $aPaths[0];
 			$bAdmin && \array_shift($aPaths);
-		} else if (empty($aPaths[0]) && \mb_strtolower($sAdminPanelHost) === \mb_strtolower($oHttp->GetHost())) {
-			$bAdmin = true;
+		} else {
+			$bAdmin = \mb_strtolower($sAdminPanelHost) === \mb_strtolower($oHttp->GetHost());
 		}
 
 		$oActions = $bAdmin ? new ActionsAdmin() : Api::Actions();