diff --git a/ChangeLog b/ChangeLog
index 1cc9d1010..cea223d06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ Deluge 1.1.1 - (In Development)
   * Fix the -l, --logfile option
   * Fix #729 tracker icons not being saved in the correct location
   * Add support for more tracker icons
+  * Fix being able to connect to a local daemon from another user account
 
 Deluge 1.1.0 - "Time gas!" (10 January 2009)
  Core:
diff --git a/deluge/ui/common.py b/deluge/ui/common.py
index 80f042f69..1f0d2e5b3 100644
--- a/deluge/ui/common.py
+++ b/deluge/ui/common.py
@@ -127,6 +127,12 @@ def get_localhost_auth_uri(uri):
     :param uri: the uri to add the authentication info to
     :returns: a localhost uri containing authentication information or None if the information is not available
     """
+    u = urlparse.urlsplit(uri)
+    # If there is already a username in this URI, let's just return it since
+    # the user has provided credentials.
+    if u.username:
+        return uri
+
     auth_file = deluge.configmanager.get_config_dir("auth")
     if os.path.exists(auth_file):
         u = urlparse.urlsplit(uri)