Fixed some user model problems
Merge pull request #75 from peshmerge/fixedUserModelProblems

Fixed some user model problems