Fixes #1242 #1243. Email address was still not happening on the client. ...

...Now it should. Also added unit tests for Email Address Regex. Fixes #1242 #1243.