diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php b/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php
index c4c62b382..e4b7035cf 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php
@@ -65,16 +65,18 @@ abstract class Upgrade
 			}
 			$sHash = $oMainAccount->CryptKey();
 			foreach ($aAccounts as $sEmail => $sToken) {
+				if ($oMainAccount->Email() == $sEmail) {
+					continue;
+				}
 				try {
 					$aNewAccounts[$sEmail] = [
 						'account',
 						$sEmail,
-						$sEmail,
-						'',
-						'',
-						'',
-						'',
-						$oMainAccount->Email(),
+						$sEmail, // sLogin
+						'',      // sPassword
+						'',      // sClientCert
+						'',      // sProxyAuthUser
+						'',      // sProxyAuthPassword
 						\hash_hmac('sha1', '', $sHash)
 					];
 					if (!$sToken) {