diff --git a/base/src/org/compiere/model/MAccount.java b/base/src/org/compiere/model/MAccount.java
index 25f7e492d8..38f992b016 100644
--- a/base/src/org/compiere/model/MAccount.java
+++ b/base/src/org/compiere/model/MAccount.java
@@ -183,13 +183,12 @@ public class MAccount extends X_C_ValidCombination
 			whereClause.append(" AND UserElement2_ID=?");
 			params.add(UserElement2_ID);
 		}
-		whereClause.append(" AND IsActive='Y'");
 		//	whereClause.append(" ORDER BY IsFullyQualified DESC");
 		
-		
-		
-		MAccount existingAccount = new Query(ctx,MAccount.Table_Name,whereClause.toString(),null)
-		.setParameters(params).first();
+		MAccount existingAccount = new Query(ctx, MAccount.Table_Name, whereClause.toString(), null)
+										.setParameters(params)
+										.setOnlyActiveRecords(true)
+										.first();
 
 		//	Existing
 		if (existingAccount != null)