should only add client_id if not already set by user