Users Module: fixes and bugs.
Merge branch 'feature/users' into develop