diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java
index 9eea98a553c..9cadef96ca6 100644
--- a/src/com/android/settings/wifi/WifiDialogActivity.java
+++ b/src/com/android/settings/wifi/WifiDialogActivity.java
@@ -36,6 +36,7 @@ public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialo
     private static final int RESULT_FORGET = RESULT_FIRST_USER + 1;
 
     private static final String KEY_ACCESS_POINT_STATE = "access_point_state";
+    private static final String KEY_WIFI_CONFIGURATION = "wifi_configuration";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -110,6 +111,9 @@ public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialo
             accessPoint.saveWifiState(accessPointState);
             resultData.putExtra(KEY_ACCESS_POINT_STATE, accessPointState);
         }
+        if (config != null) {
+            resultData.putExtra(KEY_WIFI_CONFIGURATION, config);
+        }
         setResult(RESULT_CONNECTED, resultData);
         finish();
     }