remove account.name, use email instead. special handling for primary email contact. Co-authored-by: Jonathan Cobb <jonathan@kyuss.org> Reviewed-on: #21