Added client_id authentication fixes #7