fixes email validation
Merge pull request #1763 from dimagi/cc-fixes

fixes email validation