Fixes in user management module
Merge pull request #2 from adeel-raza/features

Fixes in user management module