diff --git a/base/src/org/adempiere/util/ModelClassGenerator.java b/base/src/org/adempiere/util/ModelClassGenerator.java
index 8cc0bc922e..eb9a80f3f4 100644
--- a/base/src/org/adempiere/util/ModelClassGenerator.java
+++ b/base/src/org/adempiere/util/ModelClassGenerator.java
@@ -55,6 +55,7 @@ import org.compiere.util.Util;
  * 				<li>better formating of generated source 
  * 				<li>[ 1787876 ] ModelClassGenerator: list constants should be ordered
  * 				<li>FR [ 1803309 ] Model generator: generate get method for Search cols
+ * 				<li>BF [ 1882470 ] Generate Class Model: setter for lookup fields issue
  * @author Victor Perez, e-Evolution
  * 				<li>FR [ 1785001 ] Using ModelPackage of EntityType to Generate Model Class  
  */
@@ -524,19 +525,21 @@ public class ModelClassGenerator
 		{
 			if (columnName.endsWith("_ID"))
 			{
+				int firstOK = 1;	//	Valid ID 0
+				if (columnName.equals("AD_Client_ID") || columnName.equals("AD_Org_ID") 
+					|| columnName.equals("Record_ID") || columnName.equals("C_DocType_ID")
+					|| columnName.equals("Node_ID") || columnName.equals("AD_Role_ID")
+					|| columnName.equals("AD_User_ID")
+					|| columnName.equals("M_AttributeSet_ID") || columnName.equals("M_AttributeSetInstance_ID"))
+					firstOK = 0;
+				//
 				if (isMandatory)	//	check mandatory ID
 				{
-					int firstOK = 1;	//	Valid ID 0
-					if (columnName.equals("AD_Client_ID") || columnName.equals("AD_Org_ID") 
-						|| columnName.equals("Record_ID") || columnName.equals("C_DocType_ID")
-						|| columnName.equals("Node_ID") || columnName.equals("AD_Role_ID")
-						|| columnName.equals("M_AttributeSet_ID") || columnName.equals("M_AttributeSetInstance_ID"))
-						firstOK = 0;
 					sb.append("\t\tif (").append (columnName).append (" < ").append(firstOK).append(")").append(NL)
 						.append("\t\t\t throw new IllegalArgumentException (\"").append(columnName).append(" is mandatory.\");").append(NL);
 				}
 				else				//	set optional _ID to null if 0
-					sb.append("\t\tif (").append (columnName).append (" <= 0) ").append(NL)
+					sb.append("\t\tif (").append (columnName).append (" < ").append(firstOK).append(") ").append(NL)
 						.append("\t").append(setValue).append(" (").append ("COLUMNNAME_").append(columnName).append(", null);").append(NL)
 						.append("\t\telse ").append(NL).append("\t");
 			}