Fixing client_id