UserController fixes