Fixed issue with Refreshing LegacyTokens