user management

user management related changes