diff --git a/admin/inc/class.uiaccounts.inc.php b/admin/inc/class.uiaccounts.inc.php
index ae29dda9c5..88a346a0f6 100755
--- a/admin/inc/class.uiaccounts.inc.php
+++ b/admin/inc/class.uiaccounts.inc.php
@@ -1377,7 +1377,7 @@
 					$userData['status'] = 'A';
 					$userGroups = Array();
 					$userData['anonymous'] = False;
-					$userData['changepassword'] = True;
+					$userData['changepassword'] = (bool)$GLOBALS['egw_info']['server']['change_pwd_every_x_days'];
 					$userData['mustchangepassword'] = false;
 				}
 				$allGroups = $account->get_list('groups');