Pass `client` in credentials

[andrewclarkson]

Instead of looking up the client by id, pass it in credentials