Fix for change password flow