diff --git a/preferences/changepassword.php b/preferences/changepassword.php
new file mode 100755
index 0000000000..629d2c276d
--- /dev/null
+++ b/preferences/changepassword.php
@@ -0,0 +1,98 @@
+<?php
+	/**************************************************************************\
+	* phpGroupWare - preferences                                               *
+	* http://www.phpgroupware.org                                              *
+	* Written by Joseph Engo <jengo@phpgroupware.org>                          *
+	* --------------------------------------------                             *
+	*  This program is free software; you can redistribute it and/or modify it *
+	*  under the terms of the GNU General Public License as published by the   *
+	*  Free Software Foundation; either version 2 of the License, or (at your  *
+	*  option) any later version.                                              *
+	\**************************************************************************/
+
+	/* $Id$ */
+
+	$GLOBALS['phpgw_info']['flags'] = array(
+		'noheader'   => True,
+		'nonavbar'   => True,
+		'currentapp' => 'preferences'
+	);
+
+	include('../header.inc.php');
+
+	$n_passwd   = $_POST['n_passwd'];
+	$n_passwd_2 = $_POST['n_passwd_2'];
+
+	if(!$GLOBALS['phpgw']->acl->check('changepassword', 1) || $_POST['cancel'])
+	{
+		$GLOBALS['phpgw']->redirect_link('/preferences/index.php');
+		$GLOBALS['phpgw']->common->phpgw_exit();
+	}
+
+	$GLOBALS['phpgw']->template->set_file(array(
+		'form' => 'changepassword.tpl'
+	));
+	$GLOBALS['phpgw']->template->set_var('lang_enter_password',lang('Enter your new password'));
+	$GLOBALS['phpgw']->template->set_var('lang_reenter_password',lang('Re-enter your password'));
+	$GLOBALS['phpgw']->template->set_var('lang_change',lang('Change'));
+	$GLOBALS['phpgw']->template->set_var('lang_cancel',lang('Cancel'));
+	$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/preferences/changepassword.php'));
+
+	if ($GLOBALS['phpgw_info']['server']['auth_type'] != 'ldap')
+	{
+		$GLOBALS['phpgw']->template->set_var('sql_message',lang('note: This feature does *not* change your email password. This will '
+			. 'need to be done manually.'));
+	}
+
+	if ($_POST['change'])
+	{
+		if ($n_passwd != $n_passwd_2)
+		{
+			$errors[] = lang('The two passwords are not the same');
+		}
+
+		if (! $n_passwd)
+		{
+			$errors[] = lang('You must enter a password');
+		}
+
+		if(is_array($errors))
+		{
+			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
+			$GLOBALS['phpgw']->template->set_var('messages',$GLOBALS['phpgw']->common->error_list($errors));
+			$GLOBALS['phpgw']->template->pfp('out','form');
+			$GLOBALS['phpgw']->common->phpgw_exit(True);
+		}
+
+		$o_passwd = $GLOBALS['phpgw_info']['user']['passwd'];
+		$passwd_changed = $GLOBALS['phpgw']->auth->change_password($o_passwd, $n_passwd);
+		if(!$passwd_changed)
+		{
+			$errors[] = lang('Failed to change password.  Please contact your administrator.');
+			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
+			$GLOBALS['phpgw']->template->set_var('messages',$GLOBALS['phpgw']->common->error_list($errors));
+			$GLOBALS['phpgw']->template->pfp('out','form');
+			$GLOBALS['phpgw']->common->phpgw_exit(True);
+		}
+		else
+		{
+			$GLOBALS['phpgw']->session->appsession('password','phpgwapi',base64_encode($n_passwd));
+			$GLOBALS['hook_values']['account_id'] = $GLOBALS['phpgw_info']['user']['account_id'];
+			$GLOBALS['hook_values']['old_passwd'] = $o_passwd;
+			$GLOBALS['hook_values']['new_passwd'] = $n_passwd;
+			$GLOBALS['phpgw']->hooks->process('changepassword');
+			$GLOBALS['phpgw']->redirect_link('/preferences/index.php','cd=18');
+		}
+	}
+	else
+	{
+		$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Change your password');
+		$GLOBALS['phpgw']->common->phpgw_header();
+		echo parse_navbar();
+
+		$GLOBALS['phpgw']->template->pfp('out','form');
+		$GLOBALS['phpgw']->common->phpgw_footer();
+	}
+?>