Merged Manage Users functionality

merged with Selva's code