diff --git a/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java b/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
index 5bac68ed7..a47382bb3 100644
--- a/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
+++ b/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
@@ -16,16 +16,6 @@
 
 package com.android.email.activity.setup;
 
-import com.android.email.Email;
-import com.android.email.R;
-import com.android.email.activity.UiUtilities;
-import com.android.email.mail.Store;
-import com.android.email.provider.AccountBackupRestore;
-import com.android.emailcommon.Logging;
-import com.android.emailcommon.provider.EmailContent.Account;
-import com.android.emailcommon.provider.HostAuth;
-import com.android.emailcommon.utility.Utility;
-
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
@@ -42,6 +32,16 @@ import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import com.android.email.Email;
+import com.android.email.R;
+import com.android.email.activity.UiUtilities;
+import com.android.email.mail.Store;
+import com.android.email.provider.AccountBackupRestore;
+import com.android.emailcommon.Logging;
+import com.android.emailcommon.provider.EmailContent.Account;
+import com.android.emailcommon.provider.HostAuth;
+import com.android.emailcommon.utility.Utility;
+
 /**
  * Provides UI for IMAP/POP account settings.
  *
@@ -364,6 +364,9 @@ public class AccountSetupIncomingFragment extends AccountServerBaseFragment {
                 && Utility.isPortFieldValid(mPortView);
         enableNextButton(enabled);
 
+        String userName = mUsernameView.getText().toString().trim();
+        mCacheLoginCredential = userName;
+
         // Warn (but don't prevent) if password has leading/trailing spaces
         AccountSettingsUtils.checkPasswordSpaces(mContext, mPasswordView);
     }