diff --git a/astrid/src/com/todoroo/astrid/service/StartupService.java b/astrid/src/com/todoroo/astrid/service/StartupService.java
index 8e7cb8b7f..81099c91f 100644
--- a/astrid/src/com/todoroo/astrid/service/StartupService.java
+++ b/astrid/src/com/todoroo/astrid/service/StartupService.java
@@ -138,12 +138,8 @@ public class StartupService {
         // invoke upgrade service
         boolean justUpgraded = latestSetVersion != version;
         if(justUpgraded && version > 0) {
-            if(latestSetVersion > 0) {
+            if(latestSetVersion > 0)
                 upgradeService.performUpgrade(context, latestSetVersion);
-                if (!gtasksPreferenceService.migrationHasOccurred()) {
-                    gtasksPreferenceService.setToken(null);
-                }
-            }
             AstridPreferences.setCurrentVersion(version);
         }
         if(latestSetVersion == 0) {
diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
index c77076e2c..96a31d19a 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -36,7 +36,7 @@ import com.todoroo.astrid.utility.AstridPreferences;
 
 public final class UpgradeService {
 
-    public static final int V3_8_0_RC7 = 185;
+    public static final int V3_8_0 = 186;
     public static final int V3_7_7 = 184;
     public static final int V3_7_6 = 182;
     public static final int V3_7_5 = 179;
@@ -144,7 +144,7 @@ public final class UpgradeService {
             });
         } else {
             // current message
-            if(from < V3_8_0_RC7) {
+            if(from < V3_8_0) {
                 newVersionString(changeLog, "3.8.0 beta RC7", new String[] {
                         "Welcome to the Astrid 3.8 Beta Program!",
                         "Astrid.com sync & task sharing!",
@@ -152,6 +152,9 @@ public final class UpgradeService {
                         "New style for \"Task Edit\" page!",
                         "Purge completed or deleted tasks!",
                 });
+
+                // clear gtasks token info because of new gtasks api
+                gtasksPreferenceService.setToken(null);
             }
             if(from < V3_7_7) {
                 newVersionString(changeLog, "3.7.7 (6/22/11, bug fixes, usability, cosmetic)", new String[] {