diff --git a/panels/network/wireless-security/wireless-security.c b/panels/network/wireless-security/wireless-security.c
index d1c92797b..e109683e4 100644
--- a/panels/network/wireless-security/wireless-security.c
+++ b/panels/network/wireless-security/wireless-security.c
@@ -377,7 +377,6 @@ ws_802_1x_auth_combo_get_eap (GtkComboBox *combo)
 
 void
 ws_802_1x_auth_combo_changed (GtkComboBox *combo,
-                              WirelessSecurity *self,
                               GtkBox *vbox,
                               GtkSizeGroup *size_group)
 {
@@ -408,8 +407,6 @@ ws_802_1x_auth_combo_changed (GtkComboBox *combo,
 		if (eap_default_widget)
 			gtk_widget_grab_focus (eap_default_widget);
 	}
-
-	wireless_security_notify_changed (WIRELESS_SECURITY (self));
 }
 
 void
diff --git a/panels/network/wireless-security/wireless-security.h b/panels/network/wireless-security/wireless-security.h
index 272eb7671..d8f9211f5 100644
--- a/panels/network/wireless-security/wireless-security.h
+++ b/panels/network/wireless-security/wireless-security.h
@@ -116,7 +116,6 @@ void ws_802_1x_auth_combo_init (WirelessSecurity *sec,
                                 gboolean secrets_only);
 
 void ws_802_1x_auth_combo_changed (GtkComboBox *combo,
-                                   WirelessSecurity *sec,
                                    GtkBox *vbox,
                                    GtkSizeGroup *size_group);
 
diff --git a/panels/network/wireless-security/ws-dynamic-wep.c b/panels/network/wireless-security/ws-dynamic-wep.c
index d48357ba8..739b29591 100644
--- a/panels/network/wireless-security/ws-dynamic-wep.c
+++ b/panels/network/wireless-security/ws-dynamic-wep.c
@@ -92,9 +92,10 @@ static void
 auth_combo_changed_cb (WirelessSecurityDynamicWEP *self)
 {
 	ws_802_1x_auth_combo_changed (self->auth_combo,
-	                              WIRELESS_SECURITY (self),
 	                              self->method_box,
 	                              self->size_group);
+
+	wireless_security_notify_changed (WIRELESS_SECURITY (self));
 }
 
 WirelessSecurityDynamicWEP *
diff --git a/panels/network/wireless-security/ws-wpa-eap.c b/panels/network/wireless-security/ws-wpa-eap.c
index 9d1d35b58..489295bba 100644
--- a/panels/network/wireless-security/ws-wpa-eap.c
+++ b/panels/network/wireless-security/ws-wpa-eap.c
@@ -93,9 +93,10 @@ static void
 auth_combo_changed_cb (WirelessSecurityWPAEAP *self)
 {
 	ws_802_1x_auth_combo_changed (self->auth_combo,
-	                              WIRELESS_SECURITY (self),
 	                              self->method_box,
 	                              self->size_group);
+
+	wireless_security_notify_changed (WIRELESS_SECURITY (self));
 }
 
 WirelessSecurityWPAEAP *