diff --git a/org.adempiere.base/src/org/compiere/model/MAuthorizationAccount.java b/org.adempiere.base/src/org/compiere/model/MAuthorizationAccount.java
index 770436923d..93b9d418ae 100644
--- a/org.adempiere.base/src/org/compiere/model/MAuthorizationAccount.java
+++ b/org.adempiere.base/src/org/compiere/model/MAuthorizationAccount.java
@@ -181,7 +181,10 @@ public class MAuthorizationAccount extends X_AD_AuthorizationAccount {
 			setAccessToken(response.getAccessToken());
 			setAccessTokenTimestamp(ts);
 			setExpireInSeconds(new BigDecimal(response.getExpiresInSeconds()));
-			saveEx();
+			if (getAD_Client_ID() == 0)
+				saveCrossTenantSafeEx(); // sending a tenant email from a system account is possible
+			else
+				saveEx();
 		}
 	}