diff --git a/base/src/org/compiere/util/Login.java b/base/src/org/compiere/util/Login.java
index fc25c49831..1151908850 100644
--- a/base/src/org/compiere/util/Login.java
+++ b/base/src/org/compiere/util/Login.java
@@ -229,19 +229,19 @@ public class Login
 		if (system == null)
 			throw new IllegalStateException("No System Info");
 		
-		if (system.isLDAP())
-		{
-			authenticated = system.isLDAP(app_user, app_pwd);
-			if (authenticated)
-				app_pwd = null;
-			//	if not authenticated, use AD_User as backup
-		}
-		else if (app_pwd == null || app_pwd.length() == 0)
-		{
-			log.warning("No Apps Password");
-			return null;
-		}
-		
+		if (app_pwd == null || app_pwd.length() == 0)
+		{
+			log.warning("No Apps Password");
+			return null;
+		}
+		if (system.isLDAP())
+		{
+			authenticated = system.isLDAP(app_user, app_pwd);
+			if (authenticated)
+				app_pwd = null;
+			// if not authenticated, use AD_User as backup
+		}
+		
 		KeyNamePair[] retValue = null;
 		ArrayList<KeyNamePair> list = new ArrayList<KeyNamePair>();
 		//