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 0618470bb2..56754ae554 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/ALogin.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/ALogin.java
@@ -966,8 +966,9 @@ public final class ALogin extends CDialog
 		Env.setContext(m_ctx, "#AD_Client_ID", client.getKey());
 		MUser user = MUser.get (m_ctx, userTextField.getText());
 		if (user != null) {
-			 Env.setContext(m_ctx, "#AD_User_ID", user.getAD_User_ID() );
-			  Env.setContext(m_ctx, "#SalesRep_ID", user.getAD_User_ID() );
+			 Env.setContext(m_ctx, "#AD_User_Name", userTextField.getText());
+			 Env.setContext(m_ctx, "#AD_User_ID", user.getAD_User_ID());
+			 Env.setContext(m_ctx, "#SalesRep_ID", user.getAD_User_ID());
 		}
 		//
 		KeyNamePair[] roles = m_login.getRoles(userTextField.getText(), client);