Fix for client_id in req parm and auth header