Fixed changing password flow