diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
index 6543aec53..cf1a71774 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
@@ -46,11 +46,12 @@ trait User
 			throw $oException;
 		}
 
+		// Must be here due to bug #1241
+		$this->Plugins()->RunHook('login.success', array($oAccount));
+
 		$this->SetAuthToken($oAccount);
 		empty($this->GetActionParam('signMe', 0)) || $this->SetSignMeToken($oAccount);
 
-		$this->Plugins()->RunHook('login.success', array($oAccount));
-
 		$sLanguage = $this->GetActionParam('language', '');
 		if ($oAccount && $sLanguage) {
 			$oSettings = $this->SettingsProvider()->Load($oAccount);