Fix client credentials/3.x master