diff --git a/scm-core/src/main/java/sonia/scm/PasswordAware.java b/scm-core/src/main/java/sonia/scm/PasswordAware.java
new file mode 100644
index 0000000000..59e776a305
--- /dev/null
+++ b/scm-core/src/main/java/sonia/scm/PasswordAware.java
@@ -0,0 +1,77 @@
+/**
+ * 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;
+
+/**
+ * Interface for objects using a password.
+ *
+ * @author Sebastian Sdorra
+ * @since 1.13
+ */
+public interface PasswordAware
+{
+
+  /**
+   * Returns the encrypted password.
+   *
+   *
+   * @return encrypted password
+   */
+  public String getPassword();
+
+  /**
+   * Return a string representation of the salt used for the password hash or
+   * returns null if no salt is used.
+   *
+   *
+   * @return string representation of a salt or null
+   */
+  public String getSalt();
+
+  //~--- set methods ----------------------------------------------------------
+
+  /**
+   * Sets the encrypted password
+   *
+   *
+   * @param password encrypted password
+   */
+  public void setPassword(String password);
+
+  /**
+   * Sets the salt used to encrypt the password
+   *
+   *
+   * @param salt string representation of the salt
+   */
+  public void setSalt(String salt);
+}
diff --git a/scm-core/src/main/java/sonia/scm/security/PasswordHandler.java b/scm-core/src/main/java/sonia/scm/security/PasswordHandler.java
new file mode 100644
index 0000000000..52f1d386e7
--- /dev/null
+++ b/scm-core/src/main/java/sonia/scm/security/PasswordHandler.java
@@ -0,0 +1,68 @@
+/**
+ * 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.security;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import sonia.scm.PasswordAware;
+
+/**
+ * Checks if a plain text password matches against a encrypted one and updates
+ * password objects.
+ *
+ * @author Sebastian Sdorra
+ * @since 1.13
+ */
+public interface PasswordHandler
+{
+
+  /**
+   * Returns true if the given password
+   * is the same as store in the password object.
+   *
+   *
+   * @param passwordAware object that holds the encrypted password
+   * @param password plain text password to check
+   *
+   * @return true if the password matches the encrypted one
+   */
+  public boolean matches(PasswordAware passwordAware, String password);
+
+  /**
+   * Updates the password of the given password object.
+   *
+   *
+   * @param passwordAware object to update
+   * @param password plain text password
+   */
+  public void updatePassword(PasswordAware passwordAware, String password);
+}