Fix bug #8561 - Password change settings not fully observed.