Fixed change password procedure