diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py
index 891ae6c64..f744bddbf 100644
--- a/deluge/ui/gtkui/connectionmanager.py
+++ b/deluge/ui/gtkui/connectionmanager.py
@@ -272,7 +272,9 @@ class ConnectionManager(component.Component):
             port = row[HOSTLIST_COL_PORT]
             user = row[HOSTLIST_COL_USER]
             password = row[HOSTLIST_COL_PASS]
-            if client.connected() and (host, port, user) == client.connection_info():
+
+            if client.connected() and \
+                (host, port, "localclient" if not user and host in ("127.0.0.1", "localhost") else user) == client.connection_info():
                 def on_info(info):
                     if not self.running:
                         return