Fix invite service from cleanup