Clean up UserAuth code
Merge pull request #79 from mikeyman77/logic/userauth

Clean up UserAuth code