Improved user management