Rework terms-of-service header