Index: network-manager-applet-1.2.6/src/libnm-gtk/nm-wifi-dialog.c
===================================================================
--- network-manager-applet-1.2.6.orig/src/libnm-gtk/nm-wifi-dialog.c
+++ network-manager-applet-1.2.6/src/libnm-gtk/nm-wifi-dialog.c
@@ -1159,7 +1159,7 @@ internal_init (NMAWifiDialog *self,
 			esc_ssid = nm_utils_ssid_to_utf8 (ssid);
 
 		tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the Wi-Fi network '%s'."),
-		                       esc_ssid ? esc_ssid : "<unknown>");
+		                       esc_ssid ? esc_ssid : "[unknown]");
 		gtk_window_set_title (GTK_WINDOW (self), _("Wi-Fi Network Authentication Required"));
 		label = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s",
 		                         _("Authentication required by Wi-Fi network"),
@@ -1304,6 +1304,23 @@ nma_wifi_dialog_new (NMClient *client,
 		g_return_val_if_fail (NM_IS_DEVICE_WIFI (device), NULL);
 	}
 
+	/* Copy ap information (if necessary) */
+	if (ap) {
+		GByteArray *ssid;
+		ssid = nm_access_point_get_ssid (ap);
+		if (ssid) {
+			NMSettingWireless *s_wireless;
+			s_wireless = nm_connection_get_setting_wireless (connection);
+			if (!s_wireless) {
+				s_wireless = (NMSettingWireless *) nm_setting_wireless_new ();
+				g_object_set (s_wireless, NM_SETTING_WIRELESS_SSID, ssid, NULL);
+				nm_connection_add_setting (priv->connection, (NMSetting *) s_wireless);
+			} else {
+				g_object_set (s_wireless, NM_SETTING_WIRELESS_SSID, ssid, NULL);
+			}
+		}
+	}
+
 	self = NMA_WIFI_DIALOG (g_object_new (NMA_TYPE_WIFI_DIALOG, NULL));
 	if (self) {
 		priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);