diff --git a/admin/inc/class.boaccounts.inc.php b/admin/inc/class.boaccounts.inc.php
index 4f3f55b117..c18f18f2d1 100755
--- a/admin/inc/class.boaccounts.inc.php
+++ b/admin/inc/class.boaccounts.inc.php
@@ -730,13 +730,13 @@
 			{
 				$acl->delete_repository('phpgwapi','anonymous',$_userData['account_id']);
 			}
-			if ($_userData['changepassword']) 
+			if (!$_userData['changepassword']) 
 			{
-				$GLOBALS['egw']->acl->add_repository('preferences','changepassword',$_userData['account_id'],1);
+				$GLOBALS['egw']->acl->add_repository('preferences','nopasswordchange',$_userData['account_id'],1);
 			}
 			else
 			{
-				$GLOBALS['egw']->acl->delete_repository('preferences','changepassword',$_userData['account_id']);
+				$GLOBALS['egw']->acl->delete_repository('preferences','nopasswordchange',$_userData['account_id']);
 			}
 			$GLOBALS['egw']->session->delete_cache((int)$_userData['account_id']);
 		}
diff --git a/admin/inc/class.soaccounts.inc.php b/admin/inc/class.soaccounts.inc.php
index 324ba47e33..40f9b6a7b8 100755
--- a/admin/inc/class.soaccounts.inc.php
+++ b/admin/inc/class.soaccounts.inc.php
@@ -78,9 +78,9 @@
 			}
 			$apps->save_repository();
 
-			if ($userData['changepassword'])
+			if (!$userData['changepassword'])
 			{
-				$GLOBALS['egw']->acl->add_repository('preferences','changepassword',$userData['account_id'],1);
+				$GLOBALS['egw']->acl->add_repository('preferences','nopasswordchange',$userData['account_id'],1);
 			}
 
 			$apps->account_apps = array(array());
diff --git a/admin/inc/class.uiaccounts.inc.php b/admin/inc/class.uiaccounts.inc.php
index 706b131a83..2e736cbdc2 100755
--- a/admin/inc/class.uiaccounts.inc.php
+++ b/admin/inc/class.uiaccounts.inc.php
@@ -670,7 +670,7 @@
 			// NDEE210804
 			// added for different way of handling ldap entries inside account manager
 			// we show this only, if accounts are stored in ldap
-
+/* just doublicated EMailAdmin functionality 
 			if ($GLOBALS['egw_info']['server']['account_repository'] == "ldap")
 			{
 				$GLOBALS['menuData'][] = array(
@@ -679,6 +679,7 @@
 				'extradata'     => 'menuaction=admin.uildap_mgr.editUserData'
 				);
 			}
+*/
 			//NDEE
 			
 			
@@ -767,7 +768,7 @@
 
 			$acl =& CreateObject('phpgwapi.acl',(int)$_GET['account_id']);
 			$var['anonymous']         = $acl->check('anonymous',1,'phpgwapi') ? '  X' : ' ';
-			$var['changepassword']    = $acl->check('changepassword',0xFFFF,'preferences') ? '  X' : ' ';
+			$var['changepassword']    = !$acl->check('nopasswordchange',1,'preferences') ? '  X' : ' ';
 			unset($acl);
 
 			if ($userData['status'])
@@ -1087,7 +1088,7 @@
 					$acl =& CreateObject('phpgwapi.acl',$_account_id);
 					$acl->read_repository();
 					$userData['anonymous'] = $acl->check('anonymous',1,'phpgwapi');
-					$userData['changepassword'] = $acl->check('changepassword',0xFFFF,'preferences');
+					$userData['changepassword'] = !$acl->check('nopasswordchange',1,'preferences');
 					unset($acl);
 				}
 				else