Pull request: Hotfix terms of service 346

This should be merged in both prod and dev.