UserManagement update
Merge pull request #198 from daverboy23/master

UserManager updated