diff --git a/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java b/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
index 1a5d46de6..3c7d420da 100644
--- a/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
+++ b/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
@@ -598,7 +598,6 @@ public class AccountSetupIncomingFragment extends AccountServerBaseFragment
 
     @Override
     public void onCertificateRequested() {
-        // XXX reimplement
         final Intent intent = new Intent(CertificateRequestor.ACTION_REQUEST_CERT);
         intent.setData(Uri.parse("eas://com.android.emailcommon/certrequest"));
         startActivityForResult(intent, CERTIFICATE_REQUEST);
diff --git a/src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java b/src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java
index 0f44f3c64..9df9b012d 100644
--- a/src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java
+++ b/src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java
@@ -281,6 +281,8 @@ public class AccountSetupOutgoingFragment extends AccountServerBaseFragment
      */
     @Override
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        final HostAuth sendAuth = mSetupData.getAccount().getOrCreateHostAuthSend(mAppContext);
+        mAuthenticationView.setAuthInfo(true, sendAuth);
         final int visibility = isChecked ? View.VISIBLE : View.GONE;
         UiUtilities.setVisibilitySafe(getView(), R.id.account_require_login_settings, visibility);
         UiUtilities.setVisibilitySafe(getView(), R.id.account_require_login_settings_2, visibility);