diff --git a/wicd/wicd-daemon.py b/wicd/wicd-daemon.py
index 28f9c76..3cd7bb4 100644
--- a/wicd/wicd-daemon.py
+++ b/wicd/wicd-daemon.py
@@ -1199,11 +1199,12 @@ class WirelessDaemon(dbus.service.Object):
         # Read the essid because we need to name those hidden
         # wireless networks now - but only read it if it is hidden.
         if cur_network["hidden"]:
-            if cur_network.get("essid") in ["", "Hidden", "<hidden>", None]:
-                cur_network["essid"] = "<hidden>"
-            else:
-                cur_network['essid'] = self.config.get(section, 'essid')
-        return "100: Loaded Profile"
+            # check if there is an essid in the config file
+            # if there isn't, .get( will return None
+            stored_essid = self.config.get(section, 'essid')
+            if stored_essid:
+                # set the current network's ESSID to the stored one
+                cur_network['essid'] = stored_essid
 
     @dbus.service.method('org.wicd.daemon.wireless')
     def SaveWirelessNetworkProfile(self, id):
diff --git a/wicd/wnettools.py b/wicd/wnettools.py
index a94617d..b088049 100644
--- a/wicd/wnettools.py
+++ b/wicd/wnettools.py
@@ -1177,7 +1177,7 @@ class BaseWirelessInterface(BaseInterface):
         except (UnicodeDecodeError, UnicodeEncodeError):
             print 'Unicode problem with current network essid, ignoring!!'
             return None
-        if ap['essid'] in ['<hidden>', "", None]:
+        if ap['essid'] in ['Hidden', '<hidden>', "", None]:
             print 'hidden'
             ap['hidden'] = True
             ap['essid'] = "<hidden>"