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 0f7884f17..4c6dda119 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -26,11 +26,13 @@ class Actions
 
 	/**
 	 * This session cookie contains a \RainLoop\Model\Account
+	 * Value is Base64 EncryptToJSON
 	 */
 	const AUTH_SPEC_TOKEN_KEY = 'smaccount';
 
 	/**
 	 * This session cookie optionally contains a \RainLoop\Model\AdditionalAccount
+	 * Value is Base64 EncryptToJSON
 	 */
 	const AUTH_ADDITIONAL_TOKEN_KEY = 'smadditional';
 
@@ -744,7 +746,7 @@ class Actions
 					}
 				}
 
-				$sToken = Utils::GetCookie(self::AUTH_MAILTO_TOKEN_KEY, null);
+				$sToken = Utils::GetCookie(self::AUTH_MAILTO_TOKEN_KEY);
 				if (null !== $sToken) {
 					Utils::ClearCookie(self::AUTH_MAILTO_TOKEN_KEY);
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
index e6b17a63a..e830f34ee 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
@@ -32,7 +32,7 @@ trait Admin
 
 	protected function getAdminAuthKey() : string
 	{
-		$cookie = Utils::GetCookie(static::$AUTH_ADMIN_TOKEN_KEY, '');
+		$cookie = Utils::GetCookie(static::$AUTH_ADMIN_TOKEN_KEY);
 		if ($cookie) {
 			$aAdminHash = Utils::DecodeKeyValuesQ($cookie);
 			if (!empty($aAdminHash[1]) && 'token' === $aAdminHash[0]) {
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
index eee191601..5d93c2117 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
@@ -416,7 +416,7 @@ trait UserAuth
 
 	public function GetSpecLogoutCustomMgsWithDeletion(): string
 	{
-		$sResult = Utils::GetCookie(self::AUTH_SPEC_LOGOUT_CUSTOM_MSG_KEY, '');
+		$sResult = Utils::GetCookie(self::AUTH_SPEC_LOGOUT_CUSTOM_MSG_KEY) ?: '';
 		if (\strlen($sResult)) {
 			Utils::ClearCookie(self::AUTH_SPEC_LOGOUT_CUSTOM_MSG_KEY);
 		}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
index 351a1de10..9aade3928 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
@@ -58,7 +58,7 @@ class Utils
 
 	public static function GetSessionToken(bool $generate = true) : ?string
 	{
-		$sToken = static::GetCookie(self::SESSION_TOKEN, null);
+		$sToken = static::GetCookie(self::SESSION_TOKEN);
 		if (!$sToken) {
 			if (!$generate) {
 				return null;
@@ -108,9 +108,8 @@ class Utils
 
 	/**
 	 * @param mixed $mDefault = null
-	 * @return mixed
 	 */
-	public static function GetCookie(string $sName, $mDefault = null)
+	public static function GetCookie(string $sName) : ?string
 	{
 		if (isset($_COOKIE[$sName])) {
 			$aParts = [];
@@ -122,7 +121,7 @@ class Utils
 			\ksort($aParts);
 			return \implode('', $aParts);
 		}
-		return $mDefault;
+		return null;
 	}
 
 	public static function GetSecureCookie(string $sName)