diff --git a/ChangeLog b/ChangeLog
index eb7e524ddc..2c1f0b701a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-05  Tambet Ingo  <tambet@gmail.com>
+
+	* libnm-util/nm-setting-8021x.c: Verify PEAP settings as well.
+
 2008-11-03  Dan Williams  <dcbw@redhat.com>
 
 	* system-settings/src/main.c
diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
index 9cc4f9317b..c22981d743 100644
--- a/libnm-util/nm-setting-8021x.c
+++ b/libnm-util/nm-setting-8021x.c
@@ -649,7 +649,7 @@ static EAPMethodsTable eap_methods_table[] = {
 	{ "mschapv2", need_secrets_password, verify_identity },
 	{ "fast", need_secrets_password, verify_identity },
 	{ "tls", need_secrets_tls, verify_tls },
-	{ "peap", need_secrets_phase2, NULL },
+	{ "peap", need_secrets_phase2, verify_ttls },
 	{ "ttls", need_secrets_phase2, verify_ttls },
 	{ "sim", need_secrets_sim, NULL },
 	{ "gtc", NULL, NULL },  // FIXME: implement