diff --git a/integrations/nextcloud/snappymail/lib/AppInfo/Application.php b/integrations/nextcloud/snappymail/lib/AppInfo/Application.php
index 01901cba4..466286ef0 100644
--- a/integrations/nextcloud/snappymail/lib/AppInfo/Application.php
+++ b/integrations/nextcloud/snappymail/lib/AppInfo/Application.php
@@ -97,7 +97,7 @@ class Application extends App implements IBootstrap
 		$userSession->listen('\OC\User', 'logout', function($user) {
 			\OC::$server->getSession()['snappymail-password'] = '';
 			SnappyMailHelper::loadApp();
-			\RainLoop\Api::LogoutCurrentLogginedUser();
+			\RainLoop\Api::Actions()->Logout(true);
 		});
 	}
 }
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 883caaa91..eee191601 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
@@ -431,8 +431,10 @@ trait UserAuth
 
 	public function Logout(bool $bMain) : void
 	{
+//		Utils::ClearCookie(Utils::SESSION_TOKEN);
 		Utils::ClearCookie(self::AUTH_ADDITIONAL_TOKEN_KEY);
 		$bMain && Utils::ClearCookie(self::AUTH_SPEC_TOKEN_KEY);
+		// TODO: kill SignMe data to prevent automatic login?
 	}
 
 	/**
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
index b609fb31f..f92d0cd74 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
@@ -172,8 +172,7 @@ abstract class Api
 
 	public static function LogoutCurrentLogginedUser() : bool
 	{
-		// TODO: kill SignMe data to prevent automatic login?
-		Utils::ClearCookie(Utils::SESSION_TOKEN);
+		static::Actions()->Logout(true);
 		return true;
 	}
 }