more UserController fixes