From 765150c19a137a8582034e0d040ca139c85c1f31 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Wed, 2 Mar 2022 11:19:43 +0100
Subject: [PATCH] Only set DevEmail/DevPassword when version is 0.0.0

---
 snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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 c7c5142e1..52fb93754 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -895,8 +895,10 @@ class Actions
 					$sLanguage = $this->ValidateLanguage($UserLanguageRaw, $sLanguage, false);
 				}
 
-				$aResult['DevEmail'] = $oConfig->Get('labs', 'dev_email', '');
-				$aResult['DevPassword'] = $oConfig->Get('labs', 'dev_password', '');
+				if ('0.0.0' === APP_VERSION) {
+					$aResult['DevEmail'] = $oConfig->Get('labs', 'dev_email', '');
+					$aResult['DevPassword'] = $oConfig->Get('labs', 'dev_password', '');
+				}
 
 				if (empty($aResult['AdditionalLoginError'])) {
 					$aResult['AdditionalLoginError'] = $this->GetSpecLogoutCustomMgsWithDeletion();
@@ -937,7 +939,6 @@ class Actions
 		// IDN
 		$aResult['Email'] = \MailSo\Base\Utils::IdnToUtf8($aResult['Email']);
 		$aResult['MailToEmail'] = \MailSo\Base\Utils::IdnToUtf8($aResult['MailToEmail']);
-		$aResult['DevEmail'] = \MailSo\Base\Utils::IdnToUtf8($aResult['DevEmail']);
 
 		$this->oPlugins->InitAppData($bAdmin, $aResult, $oAccount);