diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 916af01fe4b..3b5c58df39d 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -679,10 +679,7 @@ public class WifiConfigController implements TextWatcher,
                 mEapIdentityView.setText(enterpriseConfig.getIdentity());
                 mEapAnonymousView.setText(enterpriseConfig.getAnonymousIdentity());
             } else {
-                // Choose a default for a new network and show only appropriate
-                // fields
-                mEapMethodSpinner.setSelection(Eap.PEAP);
-                showEapFieldsByMethod(Eap.PEAP);
+                showEapFieldsByMethod(mEapMethodSpinner.getSelectedItemPosition());
             }
         } else {
             showEapFieldsByMethod(mEapMethodSpinner.getSelectedItemPosition());