Fixes cpanel/contact and cpanel/support, re #33