diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/I18n.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/I18n.java
index 3444a0904a..d5a599d3ae 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/I18n.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/I18n.java
@@ -56,6 +56,9 @@ public class I18n
   /** Field description */
   public static final String RESOURCE_BUNDLE = "sonia.resources.i18n";
 
+  /** Field description */
+  public static final String USER_NOT_FOUND = "userNotFound";
+
   /** the logger for I18n */
   private static final Logger logger = LoggerFactory.getLogger(I18n.class);
 
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetUserSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetUserSubCommand.java
new file mode 100644
index 0000000000..9473eafacd
--- /dev/null
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetUserSubCommand.java
@@ -0,0 +1,116 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of SCM-Manager; nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.cli.cmd;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import org.kohsuke.args4j.Argument;
+
+import sonia.scm.cli.I18n;
+import sonia.scm.client.ScmClientSession;
+import sonia.scm.user.User;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+@Command("get-user")
+public class GetUserSubCommand extends TemplateSubCommand
+{
+
+  /** Field description */
+  public static final String TEMPLATE = "/sonia/resources/get-user.ftl";
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public String getName()
+  {
+    return name;
+  }
+
+  //~--- set methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param name
+   */
+  public void setName(String name)
+  {
+    this.name = name;
+  }
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   */
+  @Override
+  protected void run()
+  {
+    ScmClientSession session = createSession();
+    User user = session.getUserHandler().get(name);
+
+    if (user != null)
+    {
+      Map<String, Object> env = new HashMap<String, Object>();
+
+      env.put("user", user);
+      renderTemplate(env, TEMPLATE);
+    }
+    else
+    {
+      output.println(i18n.getMessage(I18n.USER_NOT_FOUND));
+    }
+  }
+
+  //~--- fields ---------------------------------------------------------------
+
+  /** Field description */
+  @Argument(usage = "optionUserName", required = true)
+  private String name;
+}
diff --git a/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand b/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand
index f4848b49d5..810415ff8b 100644
--- a/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand
+++ b/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand
@@ -44,3 +44,4 @@ sonia.scm.cli.cmd.DeletePermissionSubCommand
 
 # user
 sonia.scm.cli.cmd.ListUsersSubCommand
+sonia.scm.cli.cmd.GetUserSubCommand
\ No newline at end of file
diff --git a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/get-user.ftl b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/get-user.ftl
new file mode 100644
index 0000000000..c9fb17237f
--- /dev/null
+++ b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/get-user.ftl
@@ -0,0 +1,6 @@
+Name:           ${user.name}
+Type:           ${user.type}
+E-Mail:         ${user.mail!""}
+Administrator:  ${user.admin?string}
+Creation-Date:  ${user.creationDate!""?string}
+Last-Modified:  ${user.lastModified!""?string}
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 8d329981ab..e32521e793 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
@@ -48,6 +48,7 @@ optionPermissionName = Group or user name
 optionPermissionType = Permission type (READ,WRITE or OWNER)
 
 repositoryNotFound = The repository is not available
+userNotFound = The user could not be found
 
 metaVar_config = configname
 metaVar_arg = subcommand arguments