diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c
index 930d631f3..29459478b 100644
--- a/panels/network/connection-editor/net-connection-editor.c
+++ b/panels/network/connection-editor/net-connection-editor.c
@@ -39,6 +39,7 @@
 #include "ce-page-8021x-security.h"
 #include "ce-page-vpn.h"
 #include "vpn-helpers.h"
+#include "eap-method.h"
 
 enum {
         DONE,
@@ -142,6 +143,8 @@ apply_edits (NetConnectionEditor *editor)
 {
         update_connection (editor);
 
+        eap_method_ca_cert_ignore_save (editor->connection);
+
         if (editor->is_new_connection) {
                 nm_client_add_connection_async (editor->client,
                                                 editor->orig_connection,
@@ -549,6 +552,8 @@ net_connection_editor_set_connection (NetConnectionEditor *editor,
 
         net_connection_editor_update_title (editor);
 
+        eap_method_ca_cert_ignore_load (editor->connection);
+
         sc = nm_connection_get_setting_connection (connection);
         type = nm_setting_connection_get_connection_type (sc);