Issue 1623 resume to relier

The only token we really use from Session is `client_id` now.