Updated user managment

Updated user managment