diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/App.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/App.java
index 494cf36af6..2cc8ff2505 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/App.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/App.java
@@ -191,6 +191,7 @@ public class App
     name = "--config",
     usage = "optionConfig",
     metaVar = "metaVar_config",
+    handler = ConfigOptionHandler.class,
     aliases = { "-c" }
   )
   private ServerConfig config;
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ConfigOptionHandler.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ConfigOptionHandler.java
index bd1cff398b..b6d10c7b76 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ConfigOptionHandler.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ConfigOptionHandler.java
@@ -61,7 +61,6 @@ public class ConfigOptionHandler extends OptionHandler<ServerConfig>
                              Setter<? super ServerConfig> setter)
   {
     super(parser, option, setter);
-    loadClientConfig();
   }
 
   //~--- methods --------------------------------------------------------------
@@ -80,7 +79,7 @@ public class ConfigOptionHandler extends OptionHandler<ServerConfig>
   public int parseArguments(Parameters parameters) throws CmdLineException
   {
     String name = parameters.getParameter(0);
-    ServerConfig config = clientConfig.getConfig(name);
+    ServerConfig config = ScmClientConfig.getInstance().getConfig(name);
 
     setter.addValue(config);
 
@@ -100,22 +99,4 @@ public class ConfigOptionHandler extends OptionHandler<ServerConfig>
   {
     return "metaVar_config";
   }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   */
-  private void loadClientConfig()
-  {
-
-    // todo
-    clientConfig = new ScmClientConfig();
-  }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private ScmClientConfig clientConfig;
 }
diff --git a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties
index 014022b697..333ed143a7 100644
--- a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties
+++ b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties
@@ -29,8 +29,12 @@
 
 VAL = value
 
+optionConfig = Configuration name
 optionServerUrl = SCM-Manager URL
 optionUsername = Username
 optionPassword = Password
 optionHelpText = Shows this help
 
+metaVar_config = configname
+metaVar_arg = subcommand arguments
+metaVar_command = subcommand