Get the client in a potentially better way

Maybe this will fix the strange issue with it redirecting the wrong
person?
Revert user data changes

They're not stable for some reason.
Merge pull request #14 from Person8880/develop

Develop
Merge pull request #15 from BrightPaul/develop

Develop