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 bc724ab4e..844df3b44 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -1513,8 +1513,6 @@ class Actions
 			if (!$oAccount) {
 				throw new Exceptions\ClientException(Notifications::AuthError);
 			}
-
-			$this->Plugins()->RunHook('login.success', array($oAccount));
 		} catch (\Throwable $oException) {
 			$this->loginErrorDelay();
 			$this->LoggerAuthHelper($oAccount, $this->getAdditionalLogParamsByUserLogin($sInputEmail));
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 4b1d93e6f..31e25bd2f 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
@@ -34,6 +34,7 @@ trait User
 		{
 			$oAccount = $this->LoginProcess($sEmail, $sPassword,
 				$bSignMe ? $this->generateSignMeToken($sEmail) : '');
+			$this->Plugins()->RunHook('login.success', array($oAccount));
 		}
 		catch (ClientException $oException)
 		{