Fix confusing typo and always list email first.