1292 handle access token

fixes #1292