Refactor email code to more appropriate name auth id
and more consistent with other auth providers