Code

Updated user management