Updated user management functionality