Fix client_key passing