Improve user get handler