diff --git a/migration/i2.1/oracle/201503111036_IDEMPIERE-2509.sql b/migration/i2.1/oracle/201503111036_IDEMPIERE-2509.sql
new file mode 100644
index 0000000000..d5cf65299a
--- /dev/null
+++ b/migration/i2.1/oracle/201503111036_IDEMPIERE-2509.sql
@@ -0,0 +1,26 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- Mar 11, 2015 10:13:08 AM CET
+-- IDEMPIERE-2509 ResetLockedAccount messages are hardcoded
+INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Message_UU,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,200331,'2483519c-32fb-496d-86d0-55b59ec42939',0,TO_DATE('2015-03-11 10:13:07','YYYY-MM-DD HH24:MI:SS'),100,'U','Y','User {0} is not locked','I',TO_DATE('2015-03-11 10:13:07','YYYY-MM-DD HH24:MI:SS'),100,'UserIsNotLocked')
+;
+
+-- Mar 11, 2015 10:13:29 AM CET
+UPDATE AD_Message SET EntityType='D',Updated=TO_DATE('2015-03-11 10:13:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200331
+;
+
+-- Mar 11, 2015 10:13:41 AM CET
+INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Message_UU,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,200332,'04e54944-1af1-4d0c-89a6-0240201e529e',0,TO_DATE('2015-03-11 10:13:41','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Could not unlock user account','I',TO_DATE('2015-03-11 10:13:41','YYYY-MM-DD HH24:MI:SS'),100,'CouldNotUnlockAccount')
+;
+
+-- Mar 11, 2015 10:14:11 AM CET
+INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Message_UU,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,200333,'a84c1b33-f127-4b3b-a526-a2fd35efafa7',0,TO_DATE('2015-03-11 10:14:11','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','The user {0} has been unlocked','I',TO_DATE('2015-03-11 10:14:11','YYYY-MM-DD HH24:MI:SS'),100,'UserUnlocked')
+;
+
+-- Mar 11, 2015 10:14:23 AM CET
+INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Message_UU,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,200334,'9857d80f-65fd-465b-98ec-398644fd93cf',0,TO_DATE('2015-03-11 10:14:22','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','locked account has been reset','I',TO_DATE('2015-03-11 10:14:22','YYYY-MM-DD HH24:MI:SS'),100,'LockedAccountResetted')
+;
+
+SELECT register_migration_script('201503111036_IDEMPIERE-2509.sql') FROM dual
+;
diff --git a/migration/i2.1/postgresql/201503111036_IDEMPIERE-2509.sql b/migration/i2.1/postgresql/201503111036_IDEMPIERE-2509.sql
new file mode 100644
index 0000000000..8eb6c2cbcc
--- /dev/null
+++ b/migration/i2.1/postgresql/201503111036_IDEMPIERE-2509.sql
@@ -0,0 +1,23 @@
+-- Mar 11, 2015 10:13:08 AM CET
+-- IDEMPIERE-2509 ResetLockedAccount messages are hardcoded
+INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Message_UU,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,200331,'2483519c-32fb-496d-86d0-55b59ec42939',0,TO_TIMESTAMP('2015-03-11 10:13:07','YYYY-MM-DD HH24:MI:SS'),100,'U','Y','User {0} is not locked','I',TO_TIMESTAMP('2015-03-11 10:13:07','YYYY-MM-DD HH24:MI:SS'),100,'UserIsNotLocked')
+;
+
+-- Mar 11, 2015 10:13:29 AM CET
+UPDATE AD_Message SET EntityType='D',Updated=TO_TIMESTAMP('2015-03-11 10:13:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200331
+;
+
+-- Mar 11, 2015 10:13:41 AM CET
+INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Message_UU,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,200332,'04e54944-1af1-4d0c-89a6-0240201e529e',0,TO_TIMESTAMP('2015-03-11 10:13:41','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Could not unlock user account','I',TO_TIMESTAMP('2015-03-11 10:13:41','YYYY-MM-DD HH24:MI:SS'),100,'CouldNotUnlockAccount')
+;
+
+-- Mar 11, 2015 10:14:11 AM CET
+INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Message_UU,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,200333,'a84c1b33-f127-4b3b-a526-a2fd35efafa7',0,TO_TIMESTAMP('2015-03-11 10:14:11','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','The user {0} has been unlocked','I',TO_TIMESTAMP('2015-03-11 10:14:11','YYYY-MM-DD HH24:MI:SS'),100,'UserUnlocked')
+;
+
+-- Mar 11, 2015 10:14:23 AM CET
+INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Message_UU,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,200334,'9857d80f-65fd-465b-98ec-398644fd93cf',0,TO_TIMESTAMP('2015-03-11 10:14:22','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','locked account has been reset','I',TO_TIMESTAMP('2015-03-11 10:14:22','YYYY-MM-DD HH24:MI:SS'),100,'LockedAccountResetted')
+;
+
+SELECT register_migration_script('201503111036_IDEMPIERE-2509.sql') FROM dual
+;
diff --git a/org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java b/org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java
index 3564e27ab6..6876d871a6 100644
--- a/org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java
+++ b/org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java
@@ -9,6 +9,7 @@ import org.compiere.process.ProcessInfoParameter;
 import org.compiere.process.SvrProcess;
 import org.compiere.util.DB;
 import org.compiere.util.Env;
+import org.compiere.util.Msg;
 
 public class ResetLockedAccount extends SvrProcess {
 
@@ -45,7 +46,7 @@ public class ResetLockedAccount extends SvrProcess {
 			MUser user = new MUser(getCtx(), p_AD_User_ID, null);
 			
 			if (!user.isLocked())
-				throw new AdempiereException("User " + user.getName() + " is not locked");
+				throw new AdempiereException(Msg.getMsg(getCtx(), "UserIsNotLocked", new Object[] {user.getName()}));
 
 			StringBuilder sql = new StringBuilder ("UPDATE AD_User SET IsLocked = 'N', DateAccountLocked=NULL, FailedLoginCount=0, Updated=SysDate ")
 					.append(" WHERE IsLocked='Y' AND AD_Client_ID = ? ")
@@ -53,9 +54,9 @@ public class ResetLockedAccount extends SvrProcess {
 					.append(" AND AD_User_ID = " + user.getAD_User_ID());
 			int no = DB.executeUpdate(sql.toString(), new Object[] { p_AD_Client_ID }, false, get_TrxName());
 			if (no <= 0)
-				throw new AdempiereException("Could not unlock user account" + user.toString());
+				throw new AdempiereException(Msg.getMsg(getCtx(), "CouldNotUnlockAccount") + user.toString());
 
-			StringBuilder msgreturn = new StringBuilder("@OK@ - The user '").append(user.getName()).append("' has been unlocked");
+			StringBuilder msgreturn = new StringBuilder(Msg.getMsg(getCtx(), "ProcessOK")).append(" - ").append(Msg.getMsg(getCtx(), "UserUnlocked", new Object[] {user.getName()}));
 			return msgreturn.toString();
 		} 
 		else 
@@ -84,9 +85,9 @@ public class ResetLockedAccount extends SvrProcess {
 			
 			int no = DB.executeUpdate(sql.toString(), p_AD_Client_ID, get_TrxName());
 			if (no < 0)
-				throw new AdempiereException("Could not unlock user account");
-			StringBuilder msgreturn = new StringBuilder().append(no).append(" locked account has been reset");
+				throw new AdempiereException(Msg.getMsg(getCtx(), "CouldNotUnlockAccount"));
+			StringBuilder msgreturn = new StringBuilder().append(no).append(" ").append(Msg.getMsg(getCtx(), "LockedAccountResetted"));
 			return msgreturn.toString();
 		}
 	}
-}
\ No newline at end of file
+}