diff --git a/ChangeLog b/ChangeLog
index 0b102904f5..dffc54be8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-16  Dan Williams  <dcbw@redhat.com>
+
+	* libnm-util/nm-setting.c
+		- (setting_wireless_security_verify): fix phase2_auth methods; 'sim'
+			also isn't valid phase2 autheap method
+
 2007-10-16  Dan Williams  <dcbw@redhat.com>
 
 	* libnm-glib/nm-client.c
diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c
index faeacadd12..349e7b9192 100644
--- a/libnm-util/nm-setting.c
+++ b/libnm-util/nm-setting.c
@@ -793,7 +793,8 @@ setting_wireless_security_verify (NMSetting *setting, GHashTable *all_settings)
 	const char *valid_groups[] = { "wep40", "wep104", "tkip", "ccmp", NULL };
 	const char *valid_eap[] = { "leap", "md5", "tls", "peap", "ttls", "sim", "psk", "fast", NULL };
 	const char *valid_phase1_peapver[] = { "0", "1", NULL };
-	const char *valid_phase2_autheap[] = { "md5", "mschapv2", "otp", "gtc", "tls", "sim", NULL };
+	const char *valid_phase2_auth[] = { "pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", "tls", NULL };
+	const char *valid_phase2_autheap[] = { "md5", "mschapv2", "otp", "gtc", "tls", NULL };
 
 	if (!self->key_mgmt || !string_in_list (self->key_mgmt, valid_key_mgmt)) {
 		g_warning ("Missing or invalid key management");
@@ -845,7 +846,7 @@ setting_wireless_security_verify (NMSetting *setting, GHashTable *all_settings)
 		return FALSE;
 	}
 
-	if (self->phase2_auth && strcmp (self->phase2_auth, "mschapv2")) {
+	if (self->phase2_auth && !string_in_list (self->phase2_auth, valid_phase2_auth)) {
 		g_warning ("Invalid phase2 authentication");
 		return FALSE;
 	}