Modifications to User Management module
Merged changes