diff --git a/hsarjcli/src/de/hsadmin/jscli/Main.java b/hsarjcli/src/de/hsadmin/jscli/Main.java
index f2f98e6..d9a4840 100644
--- a/hsarjcli/src/de/hsadmin/jscli/Main.java
+++ b/hsarjcli/src/de/hsadmin/jscli/Main.java
@@ -19,7 +19,8 @@ public class Main {
 			final CommandlineParser cmdParser = new CommandlineParser(args);
 			final String runAs = cmdParser.getRunAs();
 			console.open(runAs + "@hsadmin> ");
-			final ScriptClient scriptClient = new ScriptClient(console, cmdParser.getUser(), runAs, cmdParser.getArgs());
+			final String user = cmdParser.getUser();
+			final ScriptClient scriptClient = new ScriptClient(console, user, runAs, cmdParser.getArgs());
 			final String file = cmdParser.getFile();
 			if (file != null && file.length() > 0) {
 				if ("-".equals(file)) {
diff --git a/hsarjcli/src/de/hsadmin/jscli/conf/CommandlineParser.java b/hsarjcli/src/de/hsadmin/jscli/conf/CommandlineParser.java
index 3de7095..b900683 100644
--- a/hsarjcli/src/de/hsadmin/jscli/conf/CommandlineParser.java
+++ b/hsarjcli/src/de/hsadmin/jscli/conf/CommandlineParser.java
@@ -39,7 +39,9 @@ public class CommandlineParser {
 	}
 	
 	public String getUser() {
-		return cmd.getOptionValue("user", System.getProperty("user.name"));
+		final String systemUser = System.getProperty("user.name");
+		final String configUser = Config.getInstance().getProperty("userName", systemUser);
+		return cmd.getOptionValue("user", configUser);
 	}
 	
 	public String getRunAs() {