Minor modifications to the user system
Merge branch 'master' of https://github.com/purecosu/The-Soul-Masters