diff --git a/gtk/netentry.py b/gtk/netentry.py
index 014fbe0..e3b7edc 100644
--- a/gtk/netentry.py
+++ b/gtk/netentry.py
@@ -340,7 +340,7 @@ class WiredSettingsDialog(AdvancedSettingsDialog):
         self.chkbox_encryption = gtk.CheckButton(_('Use Encryption'))
         # Make the vbox to hold the encryption stuff.
         self.vbox_encrypt_info = gtk.VBox(False, 0)
-        self.chkbox_encryption.set_active(not wired.GetWiredProperty('encryption_enabled') is None)
+        self.chkbox_encryption.set_active(bool(wired.GetWiredProperty('encryption_enabled')))
         self.combo_encryption.set_sensitive(False)
         self.encrypt_types = misc.LoadEncryptionMethods(wired = True)
  
@@ -404,6 +404,10 @@ class WiredSettingsDialog(AdvancedSettingsDialog):
         self.txt_dhcp_hostname.set_text(dhcphname)
         self.reset_static_checkboxes()
         
+        self.chkbox_encryption.set_active(bool(wired.GetWiredProperty('encryption_enabled')))
+        self.change_encrypt_method()
+        self.toggle_encryption()
+        
     def save_settings(self):
         # Check encryption info
         encrypt_info = self.encryption_info
diff --git a/wicd/wicd-daemon.py b/wicd/wicd-daemon.py
index fb27cc6..c8bb7cf 100644
--- a/wicd/wicd-daemon.py
+++ b/wicd/wicd-daemon.py
@@ -1492,7 +1492,7 @@ class WiredDaemon(dbus.service.Object):
         for option in ["ip", "broadcast", "netmask", "gateway", "search_domain", 
                        "dns_domain", "dns1", "dns2", "dns3", "beforescript", 
                        "afterscript", "predisconnectscript",
-                       "postdisconnectscript"]:
+                       "postdisconnectscript", "encryption_enabled"]:
             self.config.set(profilename, option, None)
         self.config.set(profilename, "default", default)
         self.config.set(profilename,"dhcphostname",os.uname()[1])
@@ -1580,6 +1580,7 @@ class WiredDaemon(dbus.service.Object):
                 profile[x] = misc.Noneify(self.config.get(profilename, x))
             profile['use_global_dns'] = bool(profile.get('use_global_dns'))
             profile['use_static_dns'] = bool(profile.get('use_static_dns'))
+            profile['encryption_enabled'] = bool(profile.get('encryption_enabled'))
             profile['profilename'] = profilename
             self.WiredNetwork = profile
             self._cur_wired_prof_name = profilename