diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
index 1c7a8bc70..68efff391 100644
--- a/libnm-util/nm-setting-8021x.c
+++ b/libnm-util/nm-setting-8021x.c
@@ -947,7 +947,7 @@ static EAPMethodsTable eap_methods_table[] = {
 	{ "peap", need_secrets_phase2, verify_ttls },
 	{ "ttls", need_secrets_phase2, verify_ttls },
 	{ "sim", need_secrets_sim, NULL },
-	{ "gtc", NULL, NULL },  // FIXME: implement
+	{ "gtc", need_secrets_password, verify_identity },
 	{ "otp", NULL, NULL },  // FIXME: implement
 	{ NULL, NULL, NULL }
 };
diff --git a/system-settings/plugins/ifcfg-rh/reader.c b/system-settings/plugins/ifcfg-rh/reader.c
index e41de7d56..61f3d6879 100644
--- a/system-settings/plugins/ifcfg-rh/reader.c
+++ b/system-settings/plugins/ifcfg-rh/reader.c
@@ -1204,7 +1204,9 @@ eap_peap_reader (const char *eap_method,
 		if (!strlen (*iter))
 			continue;
 
-		if (!strcmp (*iter, "MSCHAPV2") || !strcmp (*iter, "MD5")) {
+		if (   !strcmp (*iter, "MSCHAPV2")
+		    || !strcmp (*iter, "MD5")
+		    || !strcmp (*iter, "GTC")) {
 			if (!eap_simple_reader (*iter, ifcfg, keys, s_8021x, TRUE, error))
 				goto done;
 		} else if (!strcmp (*iter, "TLS")) {
@@ -1217,7 +1219,6 @@ eap_peap_reader (const char *eap_method,
 			goto done;
 		}
 
-		// FIXME: OTP & GTC too
 		lower = g_ascii_strdown (*iter, -1);
 		g_object_set (s_8021x, NM_SETTING_802_1X_PHASE2_AUTH, lower, NULL);
 		g_free (lower);