diff --git a/src/com/android/email/activity/setup/AccountSetupExchangeFragment.java b/src/com/android/email/activity/setup/AccountSetupExchangeFragment.java
index c8ed6ad76..4ecb985a9 100644
--- a/src/com/android/email/activity/setup/AccountSetupExchangeFragment.java
+++ b/src/com/android/email/activity/setup/AccountSetupExchangeFragment.java
@@ -66,7 +66,7 @@ public class AccountSetupExchangeFragment extends AccountServerBaseFragment
 
     // Support for lifecycle
     private boolean mStarted;
-    private boolean mLoaded;
+    /* package */ boolean mLoaded;
     private String mCacheLoginCredential;
 
     /**
diff --git a/tests/src/com/android/email/activity/setup/AccountSetupExchangeTests.java b/tests/src/com/android/email/activity/setup/AccountSetupExchangeTests.java
index 5518ea4ad..b40c86b9d 100644
--- a/tests/src/com/android/email/activity/setup/AccountSetupExchangeTests.java
+++ b/tests/src/com/android/email/activity/setup/AccountSetupExchangeTests.java
@@ -188,6 +188,7 @@ public class AccountSetupExchangeTests extends
                 "eas", "hostauth", 1, false, mActivity.getBaseContext());
         account.mHostAuthRecv.mFlags |= HostAuth.FLAG_SSL;
         account.mHostAuthRecv.mFlags &= ~HostAuth.FLAG_TRUST_ALL_CERTIFICATES;
+        mActivity.mFragment.mLoaded = false;
         boolean loadResult = mActivity.mFragment.loadSettings(account);
         assertTrue(loadResult);
         assertTrue(mSslRequiredCheckbox.isChecked());
@@ -197,6 +198,7 @@ public class AccountSetupExchangeTests extends
         // Setup host auth with variants of SSL enabled and check.  This also enables the
         // "trust certificates" checkbox (not checked, but visible now).
         account.mHostAuthRecv.mFlags |= HostAuth.FLAG_TRUST_ALL_CERTIFICATES;
+        mActivity.mFragment.mLoaded = false;
         loadResult = mActivity.mFragment.loadSettings(account);
         assertTrue(loadResult);
         assertTrue(mSslRequiredCheckbox.isChecked());
@@ -205,6 +207,7 @@ public class AccountSetupExchangeTests extends
 
         // A simple test of an incomplete account, which will fail validation
         account.mHostAuthRecv.mPassword = "";
+        mActivity.mFragment.mLoaded = false;
         loadResult = mActivity.mFragment.loadSettings(account);
         assertFalse(loadResult);
     }