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 5017d8e8c..73b88dfd8 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
@@ -105,8 +105,8 @@ trait Accounts
 
 		if (\strlen($sEmailToDelete) && isset($aAccounts[$sEmailToDelete])) {
 			$bReload = false;
-//			$oAccount = $this->getAccountFromToken();
-			if ($oAccount->Email() === $sEmailToDelete) {
+			$oAccount = $this->getAccountFromToken();
+			if ($oAccount instanceof AdditionalAccount && $oAccount->Email() === $sEmailToDelete) {
 				Utils::ClearCookie(self::AUTH_ADDITIONAL_TOKEN_KEY);
 				$bReload = true;
 			}