diff --git a/migration/i1.0c-release/oracle/201307301502_IDEMPIERE-1162.sql b/migration/i1.0c-release/oracle/201307301502_IDEMPIERE-1162.sql
new file mode 100644
index 0000000000..dbf3ad9488
--- /dev/null
+++ b/migration/i1.0c-release/oracle/201307301502_IDEMPIERE-1162.sql
@@ -0,0 +1,25 @@
+-- Jul 30, 2013 3:02:24 PM COT
+-- IDEMPIERE-1162
+UPDATE R_MailText SET MailText='Dear @Name@,
+
+You are receiving this email because you (or somebody pretending to be you) said you have lost your iDempiere password.
+
+To access your iDempiere, use the temporary password from @AD_Client_ID<Name>@ below:
+@#NewPassword@
+
+Once you login, you will be directed to change password screen. Please change your password to something you can remember.
+
+Sincerely,
+The iDempiere Accounts Team
+
+Note: This email address cannot accept replies.',Updated=TO_DATE('2013-07-30 15:02:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE R_MailText_ID=200000
+;
+
+-- Jul 30, 2013 3:02:24 PM COT
+-- IDEMPIERE-1162
+UPDATE R_MailText_Trl SET IsTranslated='N' WHERE R_MailText_ID=200000
+;
+
+SELECT register_migration_script('201307301502_IDEMPIERE-1162.sql') FROM dual
+;
+
diff --git a/migration/i1.0c-release/postgresql/201307301502_IDEMPIERE-1162.sql b/migration/i1.0c-release/postgresql/201307301502_IDEMPIERE-1162.sql
new file mode 100644
index 0000000000..82d04e05cc
--- /dev/null
+++ b/migration/i1.0c-release/postgresql/201307301502_IDEMPIERE-1162.sql
@@ -0,0 +1,25 @@
+-- Jul 30, 2013 3:02:24 PM COT
+-- IDEMPIERE-1162
+UPDATE R_MailText SET MailText='Dear @Name@,
+
+You are receiving this email because you (or somebody pretending to be you) said you have lost your iDempiere password.
+
+To access your iDempiere, use the temporary password from @AD_Client_ID<Name>@ below:
+@#NewPassword@
+
+Once you login, you will be directed to change password screen. Please change your password to something you can remember.
+
+Sincerely,
+The iDempiere Accounts Team
+
+Note: This email address cannot accept replies.',Updated=TO_TIMESTAMP('2013-07-30 15:02:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE R_MailText_ID=200000
+;
+
+-- Jul 30, 2013 3:02:24 PM COT
+-- IDEMPIERE-1162
+UPDATE R_MailText_Trl SET IsTranslated='N' WHERE R_MailText_ID=200000
+;
+
+SELECT register_migration_script('201307301502_IDEMPIERE-1162.sql') FROM dual
+;
+
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ResetPasswordPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ResetPasswordPanel.java
index 2e505968de..af42ab737f 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ResetPasswordPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ResetPasswordPanel.java
@@ -509,7 +509,9 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
 		to.set_ValueOfColumn("Password", newPassword); // will be hashed and validate on saveEx
     	mailText.setUser(to);
 		String message = mailText.getMailText(true);
+		Env.setContext(m_ctx, "#NewPassword", newPassword);
 		message = Env.parseVariable(message, to, to.get_TrxName(), true);
+		Env.setContext(m_ctx, "#NewPassword", "");
 		EMail email = client.createEMail(to.getEMail(), mailText.getMailHeader(), message, mailText.isHtml());
 		if (mailText.isHtml())
 			email.setMessageHTML(mailText.getMailHeader(), message);