Use the right client-id