Fixes user handler