diff --git a/source/Plugins/AyaNova.Plugin.QBOI/Util.cs b/source/Plugins/AyaNova.Plugin.QBOI/Util.cs
index 7c98156..83117e6 100644
--- a/source/Plugins/AyaNova.Plugin.QBOI/Util.cs
+++ b/source/Plugins/AyaNova.Plugin.QBOI/Util.cs
@@ -480,8 +480,7 @@ namespace AyaNova.PlugIn.QBOI
             TimeSpan retryInterval = new TimeSpan(0, 0, 0, 1);
             SC.IppConfiguration.RetryPolicy = new Intuit.Ipp.Core.IntuitRetryPolicy(5, retryInterval);
 
-            //' For data updates, create DataService:
-          //  Intuit.Ipp.DataService.DataService loDataService = new Intuit.Ipp.DataService.DataService(SC);
+      
 
             _AuthenticationCompleted = true;
             return true;
@@ -582,9 +581,7 @@ namespace AyaNova.PlugIn.QBOI
                 }
             }
 
-            //todo: call this from all over the place (i.e. before every api call) //and remove logging
-            RefreshTokens();
-
+           
             IntegrationLog.Log(QBID, "PFC: Authentication completed, validating company data");
 
             if (QBValidate() == pfstat.Cancel)
@@ -884,6 +881,8 @@ KEY: AssignedTime, VALUE: 12/08/2017 18:52:04
              * 
              * 
              */
+
+            RefreshTokens();
             try
             {
                 QueryService<q.CompanyInfo> entityQuery = new QueryService<q.CompanyInfo>(SC);