Modified userauth
Merge branch 'master' into authBranch