diff --git a/ChangeLog b/ChangeLog
index 992922ac65..66f26ef076 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 	  test/nminfotest.c
 		- Escape ESSIDs in gconf
 
+	* src/NetworkManagerDevice.c
+		- Fix pseudo-scanning to use netowrk list from info daemon
+
 Wed Sep 29 18:18:24 2004  Jonathan Blandford  <jrb@redhat.com>
 
 	* configure.in: Add a temporary --enable-notification-icon.  This
diff --git a/info-daemon/NetworkManagerInfoDbus.c b/info-daemon/NetworkManagerInfoDbus.c
index 8188c3c946..6f2b5c3f27 100644
--- a/info-daemon/NetworkManagerInfoDbus.c
+++ b/info-daemon/NetworkManagerInfoDbus.c
@@ -232,10 +232,8 @@ static DBusMessage *nmi_dbus_get_networks (NMIAppInfo *info, DBusMessage *messag
 		{
 			char			 key[100];
 			GConfValue	*value;
-			char			*escaped_network = gnome_vfs_escape_string ((char *)(element->data));
 
-			g_snprintf (&key[0], 99, "%s/essid", escaped_network);
-			g_free (escaped_network);
+			g_snprintf (&key[0], 99, "%s/essid", (char *)(element->data));
 			value = gconf_client_get (info->gconf_client, key, NULL);
 			if (value && gconf_value_get_string (value))
 			{
diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c
index f5afc14702..4240c7fe0b 100644
--- a/src/NetworkManagerDevice.c
+++ b/src/NetworkManagerDevice.c
@@ -1995,7 +1995,6 @@ static void nm_device_do_normal_scan (NMDevice *dev)
  */
 static void nm_device_do_pseudo_scan (NMDevice *dev)
 {
-	NMAccessPointList	*list;
 	NMAPListIter		*iter;
 	NMAccessPoint		*ap;
 
@@ -2007,10 +2006,7 @@ static void nm_device_do_pseudo_scan (NMDevice *dev)
 
 	nm_device_ref (dev);
 
-	if (!(list = nm_device_ap_list_get (dev)))
-		return;
-
-	if (!(iter = nm_ap_list_iter_new (list)))
+	if (!(iter = nm_ap_list_iter_new (dev->app_data->allowed_ap_list)))
 		return;
 
 	nm_device_set_essid (dev, "");