diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php
index 1971264a6..97eed38de 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php
@@ -87,9 +87,9 @@ trait Accounts
 		if ($bNew || \strlen($oPassword)) {
 			$oNewAccount = $this->LoginProcess($sEmail, $oPassword, false);
 			$sEmail = $oNewAccount->Email();
-			$aAccounts[$sEmail] = $oNewAccount->asTokenArray($oMainAccount);
+			$aAccount = $oNewAccount->asTokenArray($oMainAccount);
 		} else {
-			$aAccounts[$sEmail] = \RainLoop\Model\AdditionalAccount::convertArray($aAccounts[$sEmail]);
+			$aAccount = \RainLoop\Model\AdditionalAccount::convertArray($aAccounts[$sEmail]);
 		}
 
 		if ($bNew) {
@@ -100,6 +100,8 @@ trait Accounts
 			throw new ClientException(Notifications::AccountDoesNotExist);
 		}
 
+		$aAccounts[$sEmail] = $aAccount;
+
 		if ($aAccounts[$sEmail]) {
 			$aAccounts[$sEmail]['name'] = \trim($this->GetActionParam('name', ''));
 			$this->SetAccounts($oMainAccount, $aAccounts);