Fixed getUser to include client_id.