diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
index 04ecffe05..3a6d7543e 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
@@ -193,7 +193,7 @@ abstract class Account implements \JsonSerializable
 		array $aAccountHash,
 		bool $bThrowExceptionOnFalse = false): ?self
 	{
-		if (!empty($aAccountHash[0]) && 'account' === $aAccountHash[0] && 7 === \count($aAccountHash)) {
+		if (!empty($aAccountHash[0]) && 'account' === $aAccountHash[0] && 7 <= \count($aAccountHash)) {
 			$oAccount = static::NewInstanceByLogin(
 				$oActions,
 				$aAccountHash[1] ?: '',
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/AdditionalAccount.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/AdditionalAccount.php
index 78bae1a04..a85a8cd77 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/AdditionalAccount.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/AdditionalAccount.php
@@ -17,13 +17,6 @@ class AdditionalAccount extends Account
 		return \md5(parent::Hash() . $this->ParentEmail());
 	}
 
-	public function jsonSerialize()
-	{
-		$aData = parent::jsonSerialize();
-		$aData[] = ''; // was ParentEmail
-		return $aData;
-	}
-
 	public function asTokenArray(MainAccount $oMainAccount) : array
 	{
 		$sHash = $oMainAccount->CryptKey();
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php b/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
index 02fe2b01c..48ae6a775 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
@@ -192,6 +192,6 @@ abstract class Crypt
 
 }
 
-\SnappyMail\Crypt::setCipher(\RainLoop\API::Config()->Get('security', 'encrypt_cipher', 'aes-256-cbc-hmac-sha1'))
+\SnappyMail\Crypt::setCipher(\RainLoop\Api::Config()->Get('security', 'encrypt_cipher', 'aes-256-cbc-hmac-sha1'))
 	|| \SnappyMail\Crypt::setCipher('aes-256-cbc-hmac-sha1')
 	|| \SnappyMail\Crypt::setCipher('aes-256-xts');