Merge "Include REGISTER_NEW_EMAIL field as editable only if email is enabled"