Check e-mails better + DRY