diff --git a/src/com/android/settings/wifi/AccessPointState.java b/src/com/android/settings/wifi/AccessPointState.java
index a3cf6b4..f842b7e 100644
--- a/src/com/android/settings/wifi/AccessPointState.java
+++ b/src/com/android/settings/wifi/AccessPointState.java
@@ -504,6 +504,7 @@
         config.priority = priority;
         config.hiddenSSID = hiddenSsid;
         config.SSID = convertToQuotedString(ssid);
+/*
         config.eap = mEap;
 
         if (!TextUtils.isEmpty(mPhase2)) {
@@ -547,6 +548,7 @@
         } else {
             config.privateKeyPasswd = null;
         }
+*/
         setupSecurity(config);
     }
     
@@ -622,7 +624,7 @@
                 config.allowedKeyManagement.set(KeyMgmt.IEEE8021X);
             }
             if (!TextUtils.isEmpty(mPassword)) {
-                config.password = convertToQuotedString(mPassword);
+//                config.password = convertToQuotedString(mPassword);
             }
         }
     }
