Improve email regex and add tests
Finish user setup