diff --git a/org.adempiere.base/src/org/compiere/model/SystemIDs.java b/org.adempiere.base/src/org/compiere/model/SystemIDs.java
index 82ad176a9c..bf6bb08f57 100644
--- a/org.adempiere.base/src/org/compiere/model/SystemIDs.java
+++ b/org.adempiere.base/src/org/compiere/model/SystemIDs.java
@@ -56,6 +56,7 @@ public class SystemIDs
 
 	public final static int MESSAGE_REQUESTUPDATE = 834;
 	public final static int MESSAGE_WORKFLOWRESULT = 753;
+	public final static int MESSAGE_NOTES = 52244;
 
 	public final static int PRINTFORMAT_STATEMENTOFACCOUNT = 134;
 	public final static int PRINTFORMAT_ORDER_HEADER_TEMPLATE = 100;
diff --git a/org.adempiere.server/src/main/server/org/compiere/server/AlertProcessor.java b/org.adempiere.server/src/main/server/org/compiere/server/AlertProcessor.java
index 7f0f8357f5..14c9461d24 100644
--- a/org.adempiere.server/src/main/server/org/compiere/server/AlertProcessor.java
+++ b/org.adempiere.server/src/main/server/org/compiere/server/AlertProcessor.java
@@ -37,6 +37,7 @@ import org.compiere.model.MNote;
 import org.compiere.model.MSysConfig;
 import org.compiere.model.MSystem;
 import org.compiere.model.MUser;
+import org.compiere.model.SystemIDs;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
 import org.compiere.util.DisplayType;
@@ -269,7 +270,8 @@ public class AlertProcessor extends AdempiereServer
 			MUser user = MUser.get(getCtx(), user_id);
 			if (user.isNotificationEMail()) {
 				String messageHTML = message.replaceAll(Env.NL, "<br>");
-				if (m_client.sendEMailAttachments (user_id, subject, messageHTML, attachments, true))
+				MClient client = MClient.get(Env.getCtx(), alert.getAD_Client_ID());
+				if (client.sendEMailAttachments (user_id, subject, messageHTML, attachments, true))
 				{
 					countMail++;
 				}
@@ -281,7 +283,7 @@ public class AlertProcessor extends AdempiereServer
 					trx = Trx.get(Trx.createTrxName("AP_NU"), true);
 					trx.setDisplayName(getClass().getName()+"_"+m_model.getName()+"_notifyUsers");
 					// Notice
-					int AD_Message_ID = 52244;  /* TODO - Hardcoded message=notes */
+					int AD_Message_ID = SystemIDs.MESSAGE_NOTES;  /* TODO - Hardcoded message=notes */
 					MNote note = new MNote(getCtx(), AD_Message_ID, user_id, trx.getTrxName());
 					note.setClientOrg(alert.getAD_Client_ID(), alert.getAD_Org_ID());
 					note.setTextMsg(message);