diff --git a/org.adempiere.base/src/org/compiere/util/Login.java b/org.adempiere.base/src/org/compiere/util/Login.java
index c0c83fd5e0..5d7a18abad 100644
--- a/org.adempiere.base/src/org/compiere/util/Login.java
+++ b/org.adempiere.base/src/org/compiere/util/Login.java
@@ -869,7 +869,7 @@ public class Login
 			if (!rs.next())
 			{
 				//  No Warning for System
-				if (AD_Role_ID != 0)
+				if (AD_Client_ID != 0)
 					retValue = "NoValidAcctInfo";
 			}
 			else
@@ -965,8 +965,6 @@ public class Login
 			rs = pstmt.executeQuery();
 			while (rs.next())
 				loadDefault (rs.getString(1), rs.getString(2));
-			DB.close(rs, pstmt);
-			rs = null; pstmt = null;
 		}
 		catch (SQLException e)
 		{