fixes access token state bug, drys demo