diff --git a/ChangeLog b/ChangeLog
index b840c3a5be..0ded58163c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-02  Dan Williams  <dcbw@redhat.com>
+
+	* libnm-util/nm-setting-8021x.c
+		- (verify): allow forcing the PEAP label to 0
+
 2008-07-02  Dan Williams  <dcbw@redhat.com>
 
 	* introspection/nm-active-connection.xml
diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
index 7380f173ce..2bb331ba1e 100644
--- a/libnm-util/nm-setting-8021x.c
+++ b/libnm-util/nm-setting-8021x.c
@@ -448,6 +448,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 	NMSetting8021x *self = NM_SETTING_802_1X (setting);
 	const char *valid_eap[] = { "leap", "md5", "tls", "peap", "ttls", "sim", "fast", NULL };
 	const char *valid_phase1_peapver[] = { "0", "1", NULL };
+	const char *valid_phase1_peaplabel[] = { "0", "1", 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 };
 	GSList *iter;
@@ -495,7 +496,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 		return FALSE;
 	}
 
-	if (self->phase1_peaplabel && strcmp (self->phase1_peaplabel, "1")) {
+	if (self->phase1_peaplabel && !nm_utils_string_in_list (self->phase1_peaplabel, valid_phase1_peaplabel)) {
 		g_set_error (error,
 		             NM_SETTING_802_1X_ERROR,
 		             NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,