Made UserAuthenticator class look nicer