Fix some samples to use user id rather than email