diff --git a/EduNetworkBuilder/NetworkCardEditor.cs b/EduNetworkBuilder/NetworkCardEditor.cs
index 2de2c05..e890d6d 100644
--- a/EduNetworkBuilder/NetworkCardEditor.cs
+++ b/EduNetworkBuilder/NetworkCardEditor.cs
@@ -172,15 +172,20 @@ namespace EduNetworkBuilder
         {
             MyNicToEdit.CanUseDHCP = cbCanUseDHCP.Checked;
             MyNicToEdit.UsesDHCP = cbDHCP.Checked;
+            SaveDataToNic();
+            Close();
+        }
+
+        private void SaveDataToNic()
+        {
             if (tbVPNEncrypt != null)
             {
                 MyNicToEdit.EncryptionKey = tbVPNEncrypt.Text;
             }
-            if(tbSSID != null)
+            if (tbSSID != null)
             {
                 MyNicToEdit.SSID = tbSSID.Text;
             }
-            Close();
         }
 
         private void btnVPNEnd_Click(object sender, EventArgs e)
@@ -192,6 +197,7 @@ namespace EduNetworkBuilder
                 MyNicToEdit.TunnelEndpoint = new IPAddress(NB.ZeroIPString, "255.255.255.0", IPAddressType.ip_only);
             }
             MyNicToEdit.TunnelEndpoint.Edit(nd, this, NB.Translate("_Endpt"));
+            SaveDataToNic();
             UpdateForm();
         }