diff --git a/cli/src/main/java/org/jboss/as/cli/impl/CliLauncher.java b/cli/src/main/java/org/jboss/as/cli/impl/CliLauncher.java
index ffa9008..f74811e 100644
--- a/cli/src/main/java/org/jboss/as/cli/impl/CliLauncher.java
+++ b/cli/src/main/java/org/jboss/as/cli/impl/CliLauncher.java
@@ -180,7 +180,7 @@ public class CliLauncher {
             }
 
             if(version) {
-                cmdCtx = new CommandContextImpl();
+                cmdCtx = initCommandContext(defaultControllerHost, defaultControllerPort, username, password, false, connect);
                 VersionHandler.INSTANCE.handle(cmdCtx);
                 return;
             }