Improved user reset