diff --git a/base/src/org/compiere/model/MRule.java b/base/src/org/compiere/model/MRule.java
index 2559f434ad..cb81914e87 100644
--- a/base/src/org/compiere/model/MRule.java
+++ b/base/src/org/compiere/model/MRule.java
@@ -22,6 +22,7 @@ import java.sql.ResultSet;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Properties;
 import java.util.logging.Level;
 
@@ -92,26 +93,11 @@ public class MRule extends X_AD_Rule
 				return retValue;
 		}
 		//
-		MRule retValue = null;
-		String sql = "SELECT * FROM AD_Rule WHERE Value=? AND IsActive='Y'";
-		PreparedStatement pstmt = null;
-		ResultSet rs = null;
-		try
-		{
-			pstmt = DB.prepareStatement (sql, null);
-			pstmt.setString(1, ruleValue);
-			rs = pstmt.executeQuery ();
-			if (rs.next ())
-				retValue = new MRule (ctx, rs, null);
-		}
-		catch (Exception e)
-		{
-			s_log.log(Level.SEVERE, sql, e);
-		}
-		finally {
-			DB.close(rs, pstmt);
-			rs = null; pstmt = null;
-		}
+		final String whereClause = "Value=?";
+		MRule retValue = new Query(ctx,I_AD_Rule.Table_Name,whereClause,null)
+		.setParameters(ruleValue)
+		.setOnlyActiveRecords(true)
+		.first();
 		
 		if (retValue != null)
 		{
@@ -128,30 +114,13 @@ public class MRule extends X_AD_Rule
 	 */
 	public static ArrayList<MRule> getModelValidatorLoginRules (Properties ctx)
 	{
+		final String whereClause = "EventType=?";
+		List<MRule>list = new Query(ctx,I_AD_Rule.Table_Name,whereClause,null)
+		.setParameters(EVENTTYPE_ModelValidatorLoginEvent)
+		.setOnlyActiveRecords(true)
+		.list();
 		ArrayList<MRule> rules = new ArrayList<MRule>();
-		MRule rule = null;
-		String sql = "SELECT * FROM AD_Rule WHERE EventType=? AND IsActive='Y'";
-		PreparedStatement pstmt = null;
-		ResultSet rs = null;
-		try
-		{
-			pstmt = DB.prepareStatement (sql, null);
-			pstmt.setString(1, EVENTTYPE_ModelValidatorLoginEvent);
-			rs = pstmt.executeQuery ();
-			while (rs.next ()) {
-				rule = new MRule (ctx, rs, null);
-				rules.add(rule);
-			}
-		}
-		catch (Exception e)
-		{
-			s_log.log(Level.SEVERE, sql, e);
-		}
-		finally {
-			DB.close(rs, pstmt);
-			rs = null; pstmt = null;
-		}
-		
+		rules.addAll(list);
 		if (rules != null && rules.size() > 0)
 			return rules;
 		else