diff --git a/src/com/android/email/activity/setup/AccountSettings.java b/src/com/android/email/activity/setup/AccountSettings.java
index 63b6dc056..eaf9b232a 100644
--- a/src/com/android/email/activity/setup/AccountSettings.java
+++ b/src/com/android/email/activity/setup/AccountSettings.java
@@ -41,6 +41,7 @@ import android.view.MenuItem;
 import android.widget.TextView;
 
 import com.android.email.R;
+import com.android.email.activity.setup.CheckSettingsProgressDialogFragment;
 import com.android.email.provider.EmailProvider;
 import com.android.emailcommon.Logging;
 import com.android.emailcommon.provider.Account;
@@ -73,7 +74,7 @@ import java.util.List;
 public class AccountSettings extends PreferenceActivity implements
         SetupDataFragment.SetupDataContainer, SecurityRequiredDialogFragment.Callback,
         CheckSettingsErrorDialogFragment.Callback, AccountCheckSettingsFragment.Callback,
-        AccountServerBaseFragment.Callback {
+        AccountServerBaseFragment.Callback, CheckSettingsProgressDialogFragment.Callback {
     /*
      * Intent to open account settings for account=1
         adb shell am start -a android.intent.action.EDIT \
@@ -673,6 +674,11 @@ public class AccountSettings extends PreferenceActivity implements
                 .commit();
     }
 
+    @Override
+    public void onCheckSettingsProgressDialogCancel() {
+        dismissCheckSettingsFragment();
+    }
+
     /**
      * After verifying a new server configuration as OK, we return here and continue. This kicks
      * off the save process.