user handling fixes