Fixed change password flow