CS-3: Improved user management