Hack in client certificate support