diff --git a/plugins/override-smtp-credentials/index.php b/plugins/override-smtp-credentials/index.php
index 9ade6106a..ef9d6057e 100644
--- a/plugins/override-smtp-credentials/index.php
+++ b/plugins/override-smtp-credentials/index.php
@@ -4,22 +4,24 @@ class OverrideSmtpCredentialsPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME = 'Override SMTP Credentials',
-		VERSION = '2.1',
-		RELEASE = '2021-04-21',
+		VERSION = '2.2',
+		RELEASE = '2022-04-13',
 		REQUIRED = '2.5.0',
 		CATEGORY = 'Filters',
 		DESCRIPTION = 'Override SMTP credentials for specific users.';
 
 	public function Init() : void
 	{
-		$this->addHook('smtp.credentials', 'FilterSmtpCredentials');
+		$this->addHook('smtp.before-connect', 'FilterSmtpCredentials');
+		$this->addHook('smtp.before-login', 'FilterSmtpCredentials');
 	}
 
 	/**
 	 * @param \RainLoop\Model\Account $oAccount
+	 * @param \MailSo\Smtp\SmtpClient $oSmtpClient
 	 * @param array $aSmtpCredentials
 	 */
-	public function FilterSmtpCredentials($oAccount, &$aSmtpCredentials)
+	public function FilterSmtpCredentials($oAccount, $oSmtpClient, &$aSmtpCredentials)
 	{
 		if ($oAccount instanceof \RainLoop\Model\Account && \is_array($aSmtpCredentials))
 		{