diff --git a/preferences/inc/class.bopassword.inc.php b/preferences/inc/class.bopassword.inc.php
index 9bf6d68b0c..d2c5b27004 100644
--- a/preferences/inc/class.bopassword.inc.php
+++ b/preferences/inc/class.bopassword.inc.php
@@ -12,7 +12,7 @@
 
 	/* $Id$ */
 
-	class bochangepassword
+	class bopassword
 	{
 		var $public_functions = array(
 			'changepass' => True
diff --git a/preferences/inc/class.uipassword.inc.php b/preferences/inc/class.uipassword.inc.php
index 9cc1d4b8bd..98933eb346 100644
--- a/preferences/inc/class.uipassword.inc.php
+++ b/preferences/inc/class.uipassword.inc.php
@@ -18,9 +18,10 @@
 			'change' => True
 		);
 
-		function uichangepassword()
+		function uipassword()
 		{
 			$this->bo = CreateObject('preferences.bopassword');
+
 		}
 
 		function change()
@@ -31,7 +32,7 @@
 
 			if(!$GLOBALS['egw']->acl->check('changepassword', 1) || $_POST['cancel'])
 			{
-				$GLOBALS['egw']->redirect_link('/preferences/index.php');
+			   $GLOBALS['egw']->redirect_link('/preferences/index.php');
 				$GLOBALS['egw']->common->phpgw_exit();
 			}
 
@@ -43,7 +44,7 @@
 			$GLOBALS['egw']->template->set_var('lang_enter_old_password',lang('Enter your old password'));
 			$GLOBALS['egw']->template->set_var('lang_change',lang('Change'));
 			$GLOBALS['egw']->template->set_var('lang_cancel',lang('Cancel'));
-			$GLOBALS['egw']->template->set_var('form_action',$GLOBALS['egw']->link('/index.php','menuaction=preferences.uichangepassword.change'));
+			$GLOBALS['egw']->template->set_var('form_action',$GLOBALS['egw']->link('/index.php','menuaction=preferences.uipassword.change'));
 
 			if($GLOBALS['egw_info']['server']['auth_type'] != 'ldap')
 			{