diff --git a/integrations/nextcloud/snappymail/lib/Controller/FetchController.php b/integrations/nextcloud/snappymail/lib/Controller/FetchController.php
index 2b33ad945..6ba8a7761 100644
--- a/integrations/nextcloud/snappymail/lib/Controller/FetchController.php
+++ b/integrations/nextcloud/snappymail/lib/Controller/FetchController.php
@@ -61,11 +61,15 @@ class FetchController extends Controller {
 				]);
 			}
 
+			SnappyMailHelper::loadApp();
+
+			$oConfig = \RainLoop\Api::Config();
 			if (!empty($_POST['snappymail-app_path'])) {
-				$oConfig = \RainLoop\Api::Config();
 				$oConfig->Set('webmail', 'app_path', $_POST['snappymail-app_path']);
-				$oConfig->Save();
 			}
+			$oConfig->Set('webmail', 'allow_languages_on_settings', empty($_POST['snappymail-nc-lang']));
+			$oConfig->Set('login', 'allow_languages_on_login', empty($_POST['snappymail-nc-lang']));
+			$oConfig->Save();
 
 			if (!empty($_POST['import-rainloop'])) {
 				return new JSONResponse([
@@ -74,7 +78,6 @@ class FetchController extends Controller {
 				]);
 			}
 
-			SnappyMailHelper::loadApp();
 			$debug = !empty($_POST['snappymail-debug']);
 			$oConfig = \RainLoop\Api::Config();
 			if ($debug != $oConfig->Get('debug', 'enable', false)) {
@@ -133,7 +136,7 @@ class FetchController extends Controller {
 			// TODO: Handle both exceptions separately?
 			SnappyMailHelper::loadApp();
 			\RainLoop\Api::Actions()->DoLogout();
-			
+
 			return new JSONResponse([
 				'status' => 'error',
 				'Message' => $e->getMessage()
diff --git a/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php b/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php
index cca015aa9..966ef2352 100644
--- a/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php
+++ b/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php
@@ -54,6 +54,8 @@ class InstallStep implements IRepairStep
 		if (!$oConfig->Get('webmail', 'app_path')) {
 			$output->info('Set config [webmail]app_path');
 			$oConfig->Set('webmail', 'app_path', \OC::$server->getAppManager()->getAppWebPath('snappymail') . '/app/');
+			$oConfig->Set('webmail', 'allow_languages_on_settings', false);
+			$oConfig->Set('login', 'allow_languages_on_login', false);
 			$bSave = true;
 		}
 
diff --git a/integrations/nextcloud/snappymail/lib/Settings/AdminSettings.php b/integrations/nextcloud/snappymail/lib/Settings/AdminSettings.php
index 82264bfba..7a69cb96f 100644
--- a/integrations/nextcloud/snappymail/lib/Settings/AdminSettings.php
+++ b/integrations/nextcloud/snappymail/lib/Settings/AdminSettings.php
@@ -71,6 +71,7 @@ class AdminSettings implements ISettings
 			$oConfig->Save();
 		}
 		$parameters['snappymail-app_path'] = $oConfig->Get('webmail', 'app_path', false);
+		$parameters['snappymail-nc-lang'] = !$oConfig->Get('webmail', 'allow_languages_on_settings', true);
 
 		\OCP\Util::addScript('snappymail', 'snappymail');
 		return new TemplateResponse('snappymail', 'admin-local', $parameters);
diff --git a/integrations/nextcloud/snappymail/templates/admin-local.php b/integrations/nextcloud/snappymail/templates/admin-local.php
index abbc7f7d0..5270f3e50 100644
--- a/integrations/nextcloud/snappymail/templates/admin-local.php
+++ b/integrations/nextcloud/snappymail/templates/admin-local.php
@@ -71,6 +71,13 @@
 			<br />
 			<?php } ?>
 
+			<p>
+				<input id="snappymail-nc-lang" name="snappymail-nc-lang" type="checkbox" class="checkbox" <?php if ($_['snappymail-nc-lang']) echo 'checked="checked"'; ?>>
+				<label for="snappymail-nc-lang">
+					<?php echo($l->t('Force Nextcloud personal language')); ?>
+				</label>
+			</p>
+			<br />
 			<p>
 				<label for="snappymail-app_path">
 					<?php echo($l->t('app_path')); ?>