Fix up email address formatting