Merge "Add a preference to require email for password resets"