5.x morefixes

Ran both phpunit and katalan tests and made a few updates to the code.

Correct me if I'm wrong but I think we want to preserve the ability to operate with just an email address, right?