More fixes for #1338: Add a special client header