diff --git a/org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java b/org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java
index 3aeb8e7e3d..fae4fd5313 100644
--- a/org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java
+++ b/org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java
@@ -52,7 +52,7 @@ public class ResetLockedAccount extends SvrProcess {
 					.append(" AND DateAccountLocked IS NOT NULL ")
 					.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)
+			if (no <= 0)
 				throw new AdempiereException("Could not unlock user account" + user.toString());
 
 			StringBuilder msgreturn = new StringBuilder("@OK@ - The user '").append(user.getName()).append("' has been unlocked");
diff --git a/org.adempiere.base/src/org/compiere/model/GridTable.java b/org.adempiere.base/src/org/compiere/model/GridTable.java
index 42f079c5a5..a78f1256ee 100644
--- a/org.adempiere.base/src/org/compiere/model/GridTable.java
+++ b/org.adempiere.base/src/org/compiere/model/GridTable.java
@@ -3208,7 +3208,7 @@ public class GridTable extends AbstractTableModel
 				columnName = field.getColumnName();
 				displayType = field.getDisplayType();
 				//	Integer, ID, Lookup
-				if (displayType == DisplayType.Integer || DisplayType.isID(displayType))
+				if (displayType == DisplayType.Integer || (DisplayType.isID(displayType) && !(columnName.equals("EntityType") || columnName.equals("AD_Language"))))
 				{
 					rowData[j] = new Integer(rs.getInt(j+1));	//	Integer
 					if (rs.wasNull())