diff --git a/ChangeLog b/ChangeLog
index 6aa1d95cd2..606c746705 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-27  Robert Love  <rml@novell.com>
+
+	* gnome/applet/other-network-dialog.c: Do not allow the user to try to
+	  create WPA-EAP Ad-Hoc networks because such an action makes no sense.
+
 2006-03-27  Robert Love  <rml@novell.com>
 
 	Patch by Jürg Billeter <j@bitron.ch>:
diff --git a/gnome/applet/other-network-dialog.c b/gnome/applet/other-network-dialog.c
index e66cf49bd7..bc36504b52 100644
--- a/gnome/applet/other-network-dialog.c
+++ b/gnome/applet/other-network-dialog.c
@@ -329,11 +329,11 @@ static GtkDialog *nma_ond_init (GladeXML *xml, NMApplet *applet, gboolean create
 	gtk_tree_model_get (model, &iter, NAME_COLUMN, &str, DEV_COLUMN, &dev, -1);
 	g_assert (dev);
 	dev_caps = network_device_get_type_capabilities (dev);
-	/* Can't do WPA2/CCMP Ad-Hoc networks because wpa_supplicant
-	 * doesn't support them.
+	/* Can't do WPA2/CCMP or WPA-EAP Ad-Hoc networks because wpa_supplicant
+	 * doesn't support the former and the latter does not make sense.
 	 */
 	if (create_network)
-		dev_caps &= ~NM_802_11_CAP_PROTO_WPA2;
+		dev_caps &= ~(NM_802_11_CAP_PROTO_WPA2 | NM_802_11_CAP_KEY_MGMT_802_1X);
 	wsm_set_capabilities (wsm, dev_caps);
 
 	security_combo = GTK_COMBO_BOX (glade_xml_get_widget (xml, "security_combo"));