diff --git a/base/src/org/compiere/model/MUser.java b/base/src/org/compiere/model/MUser.java
index ec9bb96620..1724a30ac0 100644
--- a/base/src/org/compiere/model/MUser.java
+++ b/base/src/org/compiere/model/MUser.java
@@ -164,6 +164,8 @@ public class MUser extends X_AD_User
 		int AD_Client_ID = Env.getAD_Client_ID(ctx);
 		
 		MUser retValue = null;
+		/* TODO: Implement same validation as in Login.java - 
+		 * about (SELECT IsEncrypted FROM AD_Column WHERE AD_Column_ID=417)='N') */
 		String sql = "SELECT * FROM AD_User "
 			+ "WHERE Name=? AND (Password=? OR Password=?) AND IsActive='Y' AND AD_Client_ID=?";
 		PreparedStatement pstmt = null;
diff --git a/client/src/org/compiere/apps/form/VInOutGen.java b/client/src/org/compiere/apps/form/VInOutGen.java
index e92f3388b4..7e833d3d5a 100644
--- a/client/src/org/compiere/apps/form/VInOutGen.java
+++ b/client/src/org/compiere/apps/form/VInOutGen.java
@@ -281,10 +281,7 @@ public class VInOutGen extends CPanel
             + "WHERE ic.AD_Org_ID=o.AD_Org_ID"
             + " AND ic.C_BPartner_ID=bp.C_BPartner_ID"
             + " AND ic.C_DocType_ID=dt.C_DocType_ID"
-            + " AND ic.AD_Client_ID=?"
-            + " AND NOT EXISTS (SELECT * FROM M_InOut i, M_InOutLine il, C_OrderLine ol"
-            + " WHERE ol.C_Order_ID=ic.C_Order_ID AND  i.M_InOut_ID = il.M_InOut_ID AND"
-            + " il.C_OrderLine_ID = ol.C_OrderLine_ID AND i.DocStatus IN ('IP', 'CO', 'CL')) ");
+            + " AND ic.AD_Client_ID=?");
 
         if (m_M_Warehouse_ID != null)
             sql.append(" AND ic.M_Warehouse_ID=").append(m_M_Warehouse_ID);