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 1c65ae1fa..686741b44 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -968,7 +968,9 @@ class Actions
 
 				if ($oSettings instanceof Settings) {
 					if ($oConfig->Get('webmail', 'allow_languages_on_settings', true)) {
-						$sLanguage = (string)$oSettings->GetConf('Language', $sLanguage);
+						$sLanguage = (string)$oSettings->GetConf('Language',
+							$oConfig->Get('login', 'determine_user_language', true) ? $UserLanguageRaw : $sLanguage
+						);
 					}
 
 					$aResult['EditorDefaultType'] = (string)$oSettings->GetConf('EditorDefaultType', $aResult['EditorDefaultType']);
@@ -1001,8 +1003,7 @@ class Actions
 				}
 			}
 			else {
-				if ($oConfig->Get('login', 'allow_languages_on_login', true)
-					&& $oConfig->Get('login', 'determine_user_language', true)) {
+				if ($oConfig->Get('login', 'allow_languages_on_login', true) && $oConfig->Get('login', 'determine_user_language', true)) {
 					$sLanguage = $this->ValidateLanguage($UserLanguageRaw, $sLanguage, false);
 				}