diff --git a/plugins/mailcow-change-password/LICENSE b/plugins/mailcow-change-password/LICENSE
new file mode 100644
index 000000000..3a897637b
--- /dev/null
+++ b/plugins/mailcow-change-password/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Caleb Blankemeyer (https://github.com/zikeji)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/mailcow-change-password/MailcowChangePasswordDriver.php b/plugins/mailcow-change-password/MailcowChangePasswordDriver.php
new file mode 100644
index 000000000..cac750df5
--- /dev/null
+++ b/plugins/mailcow-change-password/MailcowChangePasswordDriver.php
@@ -0,0 +1,162 @@
+<?php
+
+class MailcowChangePasswordDriver implements \RainLoop\Providers\ChangePassword\ChangePasswordInterface
+{
+	/**
+	 * @var string
+	 */
+	private $sDsn = '';
+
+	/**
+	 * @var string
+	 */
+	private $sUser = '';
+
+	/**
+	 * @var string
+	 */
+	private $sPassword = '';
+
+	/**
+	 * @var string
+	 */
+	private $sAllowedEmails = '';
+
+	/**
+	 * @var \MailSo\Log\Logger
+	 */
+	private $oLogger = null;
+
+	/**
+	 * @param string $sDsn
+	 * @param string $sUser
+	 * @param string $sPassword
+	 *
+	 * @return \IspConfigChangePasswordDriver
+	 */
+	public function SetConfig($sDsn, $sUser, $sPassword)
+	{
+		$this->sDsn = $sDsn;
+		$this->sUser = $sUser;
+		$this->sPassword = $sPassword;
+
+		return $this;
+	}
+
+	/**
+	 * @param string $sAllowedEmails
+	 *
+	 * @return \IspConfigChangePasswordDriver
+	 */
+	public function SetAllowedEmails($sAllowedEmails)
+	{
+		$this->sAllowedEmails = $sAllowedEmails;
+		return $this;
+	}
+
+	/**
+	 * @param \MailSo\Log\Logger $oLogger
+	 *
+	 * @return \IspConfigChangePasswordDriver
+	 */
+	public function SetLogger($oLogger)
+	{
+		if ($oLogger instanceof \MailSo\Log\Logger)
+		{
+			$this->oLogger = $oLogger;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * @param \RainLoop\Account $oAccount
+	 *
+	 * @return bool
+	 */
+	public function PasswordChangePossibility($oAccount)
+	{
+		return $oAccount && $oAccount->Email() &&
+			\RainLoop\Plugins\Helper::ValidateWildcardValues($oAccount->Email(), $this->sAllowedEmails);
+	}
+
+	/**
+	 * @param \RainLoop\Account $oAccount
+	 * @param string $sPrevPassword
+	 * @param string $sNewPassword
+	 *
+	 * @return bool
+	 */
+	public function ChangePassword(\RainLoop\Account $oAccount, $sPrevPassword, $sNewPassword)
+	{
+		if ($this->oLogger)
+		{
+			$this->oLogger->Write('Mailcow: Try to change password for '.$oAccount->Email());
+		}
+
+		$bResult = false;
+		if (!empty($this->sDsn) && 0 < \strlen($this->sUser) && 0 < \strlen($this->sPassword) && $oAccount)
+		{
+			try
+			{
+				$oPdo = new \PDO($this->sDsn, $this->sUser, $this->sPassword);
+				$oPdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+
+				$oStmt = $oPdo->prepare('SELECT password, username FROM mailbox WHERE username = ? LIMIT 1');
+				if ($oStmt->execute(array($oAccount->IncLogin())))
+				{
+					$aFetchResult = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
+					if (\is_array($aFetchResult) && isset($aFetchResult[0]['password'], $aFetchResult[0]['username']))
+					{
+						$sDbPassword = $aFetchResult[0]['password'];
+						if (\substr($sDbPassword, 0, 14) === '{SHA512-CRYPT}') {
+							$sDbSalt = \substr($sDbPassword, 17, 16);
+						} else {
+							$sDbSalt = \substr($sDbPassword, 3, 16);
+						}
+
+						if ('{SHA512-CRYPT}'.\crypt($sPrevPassword, '$6$'.$sDbSalt) === $sDbPassword)
+						{
+							$oStmt = $oPdo->prepare('UPDATE mailbox SET password = ? WHERE username = ?');
+							if ($oStmt->execute(array($this->cryptPassword($sNewPassword), $aFetchResult[0]['username']))) {
+								$oStmt = $oPdo ->prepare('UPDATE users SET digesta1=MD5(CONCAT(?, ":SabreDAV:", ?)) WHERE username=?');
+								if ($oStmt->execute(array($aFetchResult[0]['username'],$sNewPassword,$aFetchResult[0]['username']))) {
+									//the MailCow & SabreDav have been updated, now update the doveadm password
+									exec("/usr/bin/doveadm pw -s SHA512-CRYPT -p $sNewPassword", $hash, $return);
+									$bResult = true;
+								}
+							}
+						}
+					}
+				}
+			}
+			catch (\Exception $oException)
+			{
+				if ($this->oLogger)
+				{
+					$this->oLogger->WriteException($oException);
+				}
+			}
+		}
+
+		return $bResult;
+	}
+
+	/**
+	 * @param string $sPassword
+	 * @return string
+	 */
+	private function cryptPassword($sPassword)
+	{
+		$sSalt = '';
+		$sBase64 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+
+		for ($iIndex = 0; $iIndex < 16; $iIndex++)
+		{
+			$sSalt .= $sBase64[\rand(0, 63)];
+		}
+
+		$crypted = \crypt($sPassword, '$6$'.$sSalt);
+		return '{SHA512-CRYPT}'.$crypted;
+	}
+}
diff --git a/plugins/mailcow-change-password/README b/plugins/mailcow-change-password/README
new file mode 100644
index 000000000..2d75466b9
--- /dev/null
+++ b/plugins/mailcow-change-password/README
@@ -0,0 +1,5 @@
+Plugin that adds functionality to change the email account password with the email frontend [mailcow](https://github.com/andryyy/mailcow).
+
+Changes the SQL password (for the default ui for users), the dovecot password, and the SabreDAV password. Essentially does what their own PHP script does. It also ensures the old password matches the actual old password (something their Roundcube plugin does not do).
+
+This plugin is a modification of the [ispconfig-change-password](https://github.com/RainLoop/rainloop-webmail/tree/master/plugins/ipsconfig-change-password) plugin.
diff --git a/plugins/mailcow-change-password/VERSION b/plugins/mailcow-change-password/VERSION
new file mode 100644
index 000000000..d3827e75a
--- /dev/null
+++ b/plugins/mailcow-change-password/VERSION
@@ -0,0 +1 @@
+1.0
diff --git a/plugins/mailcow-change-password/index.php b/plugins/mailcow-change-password/index.php
new file mode 100644
index 000000000..fdd58cf09
--- /dev/null
+++ b/plugins/mailcow-change-password/index.php
@@ -0,0 +1,76 @@
+<?php
+
+class MailcowChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	public function Init()
+	{
+		$this->addHook('main.fabrica', 'MainFabrica');
+	}
+
+	/**
+	 * @return string
+	 */
+	public function Supported()
+	{
+		if (!extension_loaded('pdo') || !class_exists('PDO'))
+		{
+			return 'The PHP exention PDO (mysql) must be installed to use this plugin';
+		}
+
+		$aDrivers = \PDO::getAvailableDrivers();
+		if (!is_array($aDrivers) || !in_array('mysql', $aDrivers))
+		{
+			return 'The PHP exention PDO (mysql) must be installed to use this plugin';
+		}
+
+		return '';
+	}
+
+	/**
+	 * @param string $sName
+	 * @param mixed $oProvider
+	 */
+	public function MainFabrica($sName, &$oProvider)
+	{
+		switch ($sName)
+		{
+			case 'change-password':
+
+				$sDsn = \trim($this->Config()->Get('plugin', 'pdo_dsn', ''));
+				$sUser = (string) $this->Config()->Get('plugin', 'user', '');
+				$sPassword = (string) $this->Config()->Get('plugin', 'password', '');
+
+				if (!empty($sDsn) && 0 < \strlen($sUser) && 0 < \strlen($sPassword))
+				{
+					include_once __DIR__.'/MailcowChangePasswordDriver.php';
+
+					$oProvider = new MailcowChangePasswordDriver();
+					$oProvider->SetLogger($this->Manager()->Actions()->Logger());
+					$oProvider->SetConfig($sDsn, $sUser, $sPassword);
+					$oProvider->SetAllowedEmails(\strtolower(\trim($this->Config()->Get('plugin', 'allowed_emails', ''))));
+				}
+
+				break;
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	public function configMapping()
+	{
+		return array(
+			\RainLoop\Plugins\Property::NewInstance('pdo_dsn')->SetLabel('Mailcow PDO dsn')
+				->SetDefaultValue('mysql:host=127.0.0.1;dbname=mailcow'),
+			\RainLoop\Plugins\Property::NewInstance('user')->SetLabel('DB User')
+				->SetDefaultValue('mailcow'),
+			\RainLoop\Plugins\Property::NewInstance('password')->SetLabel('DB Password')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::PASSWORD)
+				->SetDefaultValue(''),
+			\RainLoop\Plugins\Property::NewInstance('allowed_emails')->SetLabel('Allowed emails')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
+				->SetDescription('Allowed emails, space as delimiter, wildcard supported. Example: user1@domain1.net user2@domain1.net *@domain2.net')
+				->SetDefaultValue('*')
+		);
+	}
+}