Improved reliability on access token getting