diff --git a/src/config.c b/src/config.c
index ed27ba4670dc3b27d5aad4ba702f102ff7e727d9..471060873e4cfdd90ab22aadb7fde56866463b42 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1234,7 +1234,17 @@ int uci_apply_m2(struct agent_config *cfg, char *interface_name, char *device,
 						UCI_WLAN_IFACE,	"ifname", interface_name,
 						"wps_pushbutton", "1");
 			}
+
+			if (wifi_get_section_option(UCI_WIRELESS, UCI_WLAN_IFACE,
+							"ifname", interface_name,
+							"wps_cred_add_sae", buf,
+							sizeof(buf))) {
+				uci_set_wireless_interface_option(UCI_WIRELESS,
+						UCI_WLAN_IFACE, "ifname", interface_name,
+						"wps_cred_add_sae", "1");
+			}
 		}
+
 	}
 
 	uci_set_wireless_interface_option(UCI_WIRELESS, UCI_WLAN_IFACE, "ifname",