diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
index 4f38024d9..159d3c3b6 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
@@ -586,7 +586,7 @@ public class ActFmLoginActivity extends SherlockFragmentActivity {
                     // Successful login, create outstanding entries
                     String lastId = ActFmPreferenceService.userId(); //Preferences.getLong(ActFmPreferenceService.PREF_USER_ID, 0);
 
-                    if (!TextUtils.isEmpty(token) && RemoteModel.isUuidEmpty(lastId)) {
+                    if (!TextUtils.isEmpty(token) && !RemoteModel.isValidUuid(lastId)) {
                         constructOutstandingTables();
                     }
                     runOnUiThread(new Runnable() {