diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/ALogin.java b/org.adempiere.ui.swing/src/org/compiere/apps/ALogin.java
index f25e531c9e..73c60d8a0e 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/ALogin.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/ALogin.java
@@ -924,12 +924,11 @@ public final class ALogin extends CDialog
 		{
 			clientCombo.setSelectedIndex(0);
 			clientCombo.setVisible(false);
-			clientCombo.setVisible(false);
 			clientLabel.setVisible(false);
 		}
 		else
 		{
-			clientCombo.setVisible(true);
+			clientLabel.setVisible(true);
 			clientCombo.setVisible(true);
 		}
 
@@ -973,6 +972,10 @@ public final class ALogin extends CDialog
 		}
 		//
 		KeyNamePair[] roles = m_login.getRoles(userTextField.getText(), client);
+		// Make role Combo visible
+		roleCombo.setVisible(true);
+		roleLabel.setVisible(true);
+		
 		//  delete existing rol/org items
 		if (roleCombo.getItemCount() > 0)
 			roleCombo.removeAllItems();
@@ -1005,7 +1008,6 @@ public final class ALogin extends CDialog
 		{
 			roleCombo.setSelectedIndex(0);
 			roleCombo.setVisible(false);
-			roleCombo.setVisible(false);
 			roleLabel.setVisible(false);
 			
 		}