UserController updated