diff --git a/admin/inc/class.admin_cmd_edit_user.inc.php b/admin/inc/class.admin_cmd_edit_user.inc.php
index 9fb4a0f941..4e9260ee32 100644
--- a/admin/inc/class.admin_cmd_edit_user.inc.php
+++ b/admin/inc/class.admin_cmd_edit_user.inc.php
@@ -90,6 +90,10 @@ class admin_cmd_edit_user extends admin_cmd_change_pw
 
 		$data['changepassword'] = admin_cmd::parse_boolean($data['changepassword'],$this->account ? null : true);
 		$data['anonymous'] = admin_cmd::parse_boolean($data['anonymous'],$this->account ? null : false);
+		if ($data['mustchangepassword'] && $data['changepassword'])
+		{
+			$data['account_lastpwd_change']=0;
+		}
 
 		if (!$data['account_primary_group'] && $this->account)
 		{