Revert earlier changes to email address validation
Merge branch 'issues/200-fix-foi-fetch'