diff -up NetworkManager-0.6.4/src/nm-device-802-11-wireless.c.new-password-fix NetworkManager-0.6.4/src/nm-device-802-11-wireless.c
--- NetworkManager-0.6.4/src/nm-device-802-11-wireless.c.new-password-fix	2008-01-16 16:58:41.000000000 -0500
+++ NetworkManager-0.6.4/src/nm-device-802-11-wireless.c	2008-01-16 16:59:10.000000000 -0500
@@ -3005,6 +3005,11 @@ real_act_stage4_ip_config_timeout (NMDev
 		/* Activation failed, we must have bad encryption key */
 		nm_debug ("Activation (%s/wireless): could not get IP configuration info for '%s', asking for new key.",
 				nm_device_get_iface (dev), nm_ap_get_essid (ap) ? nm_ap_get_essid (ap) : "(none)");
+
+		/* Kill the supplicant */
+		supplicant_cleanup (self);
+		remove_link_timeout (self);
+
 		nm_dbus_get_user_key_for_network (data->dbus_connection, req, TRUE);
 		ret = NM_ACT_STAGE_RETURN_POSTPONE;
 	}