refactor to service style
Merge branch 'master' into refactorEmailControler
Merge pull request #1227 from ORCID/refactorEmailControler

Refactor email controler