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 9cc3dc98f..30ef84d85 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -676,7 +676,6 @@ class Actions
 					'Email' => \MailSo\Base\Utils::IdnToUtf8($oAccount->Email()),
 					'accountHash' => $oAccount->Hash(),
 					'accountSignMe' => isset($_COOKIE[self::AUTH_SIGN_ME_TOKEN_KEY]),
-					'mainEmail' => \MailSo\Base\Utils::IdnToUtf8($this->getMainAccountFromToken()->Email()),
 
 					'contactsAllowed' => $this->AddressBookProvider($oAccount)->IsActive(),
 
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 f8fdd0710..7316ddc2e 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
@@ -200,8 +200,7 @@ trait Accounts
 		$aResult = [
 			'Email' => $oAccount->Email(),
 			'accountHash' => $oAccount->Hash(),
-			'mainEmail' => ($oAccount instanceof AdditionalAccount)
-				? $oAccount->ParentEmail() : '',
+			'mainEmail' => \RainLoop\Api::Actions()->getMainAccountFromToken()->Email(),
 			'contactsAllowed' => $this->AddressBookProvider($oAccount)->IsActive(),
 			'HideUnsubscribed' => false,
 			'UseThreads' => (bool) $oConfig->Get('defaults', 'mail_use_threads', false),