Oops, actually fix the handling of mails without '@'.