Tweak email address formatting