diff --git a/src/com/android/email/activity/setup/AccountSetupActivity.java b/src/com/android/email/activity/setup/AccountSetupActivity.java
index 65b0073cc..7257289d8 100644
--- a/src/com/android/email/activity/setup/AccountSetupActivity.java
+++ b/src/com/android/email/activity/setup/AccountSetupActivity.java
@@ -29,8 +29,8 @@ public class AccountSetupActivity extends Activity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
         SetupData.restore(savedInstanceState);
+        super.onCreate(savedInstanceState);
         if (DEBUG_SETUP_FLOWS) {
             Log.d(getClass().getName(), SetupData.debugString());
         }