diff --git a/cli/wicd-cli.py b/cli/wicd-cli.py
index 0621bad..89113c7 100644
--- a/cli/wicd-cli.py
+++ b/cli/wicd-cli.py
@@ -189,8 +189,8 @@ if options.connect:
         wireless.ConnectWireless(options.network)
 
         check = lambda: wireless.CheckIfWirelessConnecting()
-        status = lambda: wireless.CheckWirelessConnectingStatus()[1]
-        message = lambda: wireless.CheckWirelessConnectingMessage()[1]
+        status = lambda: wireless.CheckWirelessConnectingStatus()
+        message = lambda: wireless.CheckWirelessConnectingMessage()
     elif options.wired:
         print "Connecting to wired connection on %s" % wired.DetectWiredInterface()
         wired.ConnectWired()
diff --git a/curses/wicd-curses.py b/curses/wicd-curses.py
index 33a7895..8f03c66 100755
--- a/curses/wicd-curses.py
+++ b/curses/wicd-curses.py
@@ -747,7 +747,8 @@ class appGUI():
                 iwconfig = wireless.GetIwconfig()
             else:
                 iwconfig = ''
-            essid, stat = wireless.CheckWirelessConnectingMessage()
+            essid = wireless.GetCurrentNetwork()
+            stat = wireless.CheckWirelessConnectingMessage()
             return self.set_status("%s: %s" % (essid, stat), True)
         if wired_connecting:
             return self.set_status(_('Wired Network') +
diff --git a/gtk/gui.py b/gtk/gui.py
index 9691d98..9c138a5 100644
--- a/gtk/gui.py
+++ b/gtk/gui.py
@@ -467,8 +467,9 @@ class appGui(object):
         if self.statusID:
             gobject.idle_add(self.status_bar.remove_message, 1, self.statusID)
         if info[0] == "wireless":
-            essid, stat = wireless.CheckWirelessConnectingMessage()
-            gobject.idle_add(self.set_status, "%s: %s" % (essid, stat))
+            stat = wireless.CheckWirelessConnectingMessage()
+            gobject.idle_add(self.set_status, "%s: %s" % \
+                (wireless.GetCurrentNetwork(), stat))
         elif info[0] == "wired":
             gobject.idle_add(self.set_status, _('Wired Network') + ': ' \
                 + wired.CheckWiredConnectingMessage())
diff --git a/wicd/wicd-daemon.py b/wicd/wicd-daemon.py
index 7790847..c0ab8c6 100644
--- a/wicd/wicd-daemon.py
+++ b/wicd/wicd-daemon.py
@@ -1179,9 +1179,8 @@ class WirelessDaemon(dbus.service.Object):
     def CheckWirelessConnectingStatus(self):
         """ Returns the wireless interface's status code. """
         if self.wifi.connecting_thread:
-            essid = self.wifi.connecting_thread.network["essid"]
             stat = self.wifi.connecting_thread.GetStatus()
-            return essid, stat
+            return stat
         else:
             return False
 
@@ -1189,8 +1188,8 @@ class WirelessDaemon(dbus.service.Object):
     def CheckWirelessConnectingMessage(self):
         """ Returns the wireless interface's status message. """
         if self.wifi.connecting_thread:
-            essid, stat = self.CheckWirelessConnectingStatus()
-            return essid, _status_dict[stat]
+            stat = self.CheckWirelessConnectingStatus()
+            return _status_dict[stat]
         else:
             return False