Follow-up r64901: make "e-mail" consistent