Accept email address from any domain
Minor refactoring