Refactored user model to skip email check if so configured
Refactored user model to skip email check if so configured

grrr-amsterdam/garp3,grrr-amsterdam/garp3,grrr-amsterdam/garp3,grrr-amsterdam/garp3