Small change to email address parsing