diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index b3b284bba24..e0079cbab2c 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -785,7 +785,7 @@ public class WifiConfigController implements TextWatcher,
                 }
                 String[] caCerts = enterpriseConfig.getCaCertificateAliases();
                 if (caCerts == null) {
-                    setSelection(mEapCaCertSpinner, mUnspecifiedCertString);
+                    setSelection(mEapCaCertSpinner, mDoNotValidateEapServerString);
                 } else if (caCerts.length == 1) {
                     setSelection(mEapCaCertSpinner, caCerts[0]);
                 } else {
@@ -795,7 +795,12 @@ public class WifiConfigController implements TextWatcher,
                     mEapCaCertSpinner.setSelection(MULTIPLE_CERT_SET_INDEX);
                 }
                 mEapDomainView.setText(enterpriseConfig.getDomainSuffixMatch());
-                setSelection(mEapUserCertSpinner, enterpriseConfig.getClientCertificateAlias());
+                String userCert = enterpriseConfig.getClientCertificateAlias();
+                if (TextUtils.isEmpty(userCert)) {
+                    setSelection(mEapUserCertSpinner, mDoNotProvideEapUserCertString);
+                } else {
+                    setSelection(mEapUserCertSpinner, userCert);
+                }
                 mEapIdentityView.setText(enterpriseConfig.getIdentity());
                 mEapAnonymousView.setText(enterpriseConfig.getAnonymousIdentity());
             } else {