Improve user handling