Add User Fixes
Merge branch 'master' of https://github.com/manudragon333/sm