diff --git a/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java b/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
index 637bec376..29d74d78b 100644
--- a/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
+++ b/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
@@ -395,6 +395,10 @@ public class AccountSetupIncomingFragment extends AccountServerBaseFragment
             updatePortFromSecurityType();
         }
 
+        if (recvAuth.mClientCertAlias != null) {
+            mClientCertificateSelector.setCertificate(recvAuth.mClientCertAlias);
+        }
+
         mLoadedRecvAuth = recvAuth;
         mLoaded = true;
         validateFields();