diff --git a/org.adempiere.base/src/org/compiere/model/MUser.java b/org.adempiere.base/src/org/compiere/model/MUser.java
index 130d03e931..fa6a3b5f47 100644
--- a/org.adempiere.base/src/org/compiere/model/MUser.java
+++ b/org.adempiere.base/src/org/compiere/model/MUser.java
@@ -198,7 +198,7 @@ public class MUser extends X_AD_User
 		
 		List<MUser> users = new Query(ctx, MUser.Table_Name, where.toString(), null)
 			.setParameters(name)
-			.setOrderBy(MUser.COLUMNNAME_AD_User_ID)
+			.setOrderBy("AD_Client_ID, AD_User_ID") // prefer first user on System
 			.list();
 		
 		if (users.size() == 0) {
@@ -223,6 +223,7 @@ public class MUser extends X_AD_User
 			
 			if (valid){
 				retValue=user;
+				break;
 			}
 		}