Feature/fix broken email check

Discovered this while working on fedbadges.