diff --git a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
index 95de7aba8..c97e8fcf3 100644
--- a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
+++ b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
@@ -50,6 +50,25 @@ class SnappyMailHelper
 			$bSave = true;
 		}
 
+		$ocConfig = \OC::$server->getConfig();
+		if ($ocConfig->getAppValue('snappymail', 'snappymail-autologin', false)
+		 || $ocConfig->getAppValue('snappymail', 'snappymail-autologin-with-email', false)
+		) {
+			$oProvider = \RainLoop\Api::Actions()->DomainProvider();
+			$oDomain = $oProvider->Load('nextcloud');
+			if (!($oDomain instanceof \RainLoop\Model\Domain)) {
+				$oDomain = new \RainLoop\Model\Domain('nextcloud');
+				$oDomain->SetConfig(
+					'localhost', 143, \MailSo\Net\Enumerations\ConnectionSecurityType::NONE, true,
+					true, 'localhost', 4190, \MailSo\Net\Enumerations\ConnectionSecurityType::NONE,
+					'localhost', 25, \MailSo\Net\Enumerations\ConnectionSecurityType::NONE, true, true, false, false,
+					'');
+				$oProvider->Save($oDomain);
+				$oConfig->Set('login', 'default_domain', 'nextcloud');
+				$bSave = true;
+			}
+		}
+
 		$bSave && $oConfig->Save();
 	}