Made some small improvements to user handler