Made the user generic
Merge pull request #1 from weberr13/genericUserStuff

Made the user specific access stuff more generic