diff --git a/api/src/Mail/Account.php b/api/src/Mail/Account.php
index e256af5a5b..74535f9cd4 100644
--- a/api/src/Mail/Account.php
+++ b/api/src/Mail/Account.php
@@ -1073,7 +1073,7 @@ class Account implements \ArrayAccess
 	{
 		//error_log(__METHOD__."($acc_id, ".array2string($called_for).")");
 		// some caching, but only for regular usage/users
-		if (!isset($called_for))
+		if (!isset($called_for) && (!isset(self::$instances[$acc_id]) || self::$instances[$acc_id]->user == $GLOBALS['egw_info']['user']['account_id']))
 		{
 			// act as singleton: if we already have an instance, return it
 			if (isset(self::$instances[$acc_id]))
diff --git a/notifications/inc/class.notifications_email.inc.php b/notifications/inc/class.notifications_email.inc.php
index 68dde5c87c..15b91d0e12 100644
--- a/notifications/inc/class.notifications_email.inc.php
+++ b/notifications/inc/class.notifications_email.inc.php
@@ -81,7 +81,7 @@ class notifications_email implements notifications_iface {
 		$ident = null;
 		if($this->config->async_identity)
 		{
-			$ident = Api\Mail\Account::read($this->config->async_identity);
+			$ident = Api\Mail\Account::read($this->config->async_identity, $_sender->account_id ?? null);
 		}
 		$this->mail = new Api\Mailer($ident);
 	}