Improved user handling.