tweak for the new checkbox - merge after deployment of xff-fix