diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index 4cf4b04d4..1e1463261 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -44,9 +44,9 @@ if (!isset($_COOKIE["mydms_session"])) {
 			exit;
 		}
 		$theme = $user->getTheme();
-		if (strlen($theme)==0) {
+		if (strlen($theme)==0 || !empty($settings->_overrideTheme)) {
 			$theme = $settings->_theme;
-			$user->setTheme($theme);
+//			$user->setTheme($theme);
 		}
 		$lang = $user->getLanguage();
 		if (strlen($lang)==0) {