Fix user handler