diff --git a/migration/i2.0z/oracle/201410291142_IDEMPIERE-2260.sql b/migration/i2.0z/oracle/201410291142_IDEMPIERE-2260.sql
new file mode 100644
index 0000000000..ef2c57c3f5
--- /dev/null
+++ b/migration/i2.0z/oracle/201410291142_IDEMPIERE-2260.sql
@@ -0,0 +1,6 @@
+update ad_system set name='iDempiere' where name='?'
+;
+
+SELECT register_migration_script('201410291142_IDEMPIERE-2260.sql') FROM dual
+;
+
diff --git a/migration/i2.0z/postgresql/201410291142_IDEMPIERE-2260.sql b/migration/i2.0z/postgresql/201410291142_IDEMPIERE-2260.sql
new file mode 100644
index 0000000000..ef2c57c3f5
--- /dev/null
+++ b/migration/i2.0z/postgresql/201410291142_IDEMPIERE-2260.sql
@@ -0,0 +1,6 @@
+update ad_system set name='iDempiere' where name='?'
+;
+
+SELECT register_migration_script('201410291142_IDEMPIERE-2260.sql') FROM dual
+;
+
diff --git a/org.adempiere.base/src/org/compiere/model/MClient.java b/org.adempiere.base/src/org/compiere/model/MClient.java
index eea3f1af16..5aa4c532ce 100644
--- a/org.adempiere.base/src/org/compiere/model/MClient.java
+++ b/org.adempiere.base/src/org/compiere/model/MClient.java
@@ -447,9 +447,10 @@ public class MClient extends X_AD_Client
 			return msgreturn.toString();
 		}	
 		//
-		StringBuilder msgce = new StringBuilder("iDempiere EMail Test: ").append(toString());
+		String systemName = MSystem.get(getCtx()).getName();
+		StringBuilder msgce = new StringBuilder(systemName).append(" EMail Test: ").append(toString());
 		EMail email = createEMail (getRequestEMail(),
-			"iDempiere EMail Test",msgce.toString());
+				systemName + " EMail Test",msgce.toString());
 		if (email == null){
 			StringBuilder msgreturn = new StringBuilder("Could not create EMail: ").append(getName());
 			return msgreturn.toString();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFeedbackService.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFeedbackService.java
index 592fd130cf..c5da1f38f4 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFeedbackService.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFeedbackService.java
@@ -103,7 +103,7 @@ public class DefaultFeedbackService implements IFeedbackService {
 				Msg.getMsg(Env.getCtx(), "EMailSupport"),
 				MUser.get(Env.getCtx()),
 				"",			//	to
-				"iDempiere " + Msg.getMsg(Env.getCtx(), "TraceInfo"),
+				MSystem.get(Env.getCtx()).getName() + " " + Msg.getMsg(Env.getCtx(), "TraceInfo"),
 				"", ds);
 			dialog.setAttribute(Window.MODE_KEY, Mode.OVERLAPPED);