Update to allow for per-client access token expiration
Fix for token errors getting squashed by previous changes