Refactors and requires a valid (or at least a valid-looking) email address