Improved user handling