Tweaked name/email separation