Keep 'name or email' field in UpsertUser