Changes towards supporting user password changes