diff --git a/ChangeLog b/ChangeLog
index 9ee3be22a..8584a80a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 === Deluge 1.2.0_rc2 (In Development) ===
 ==== GtkUI ====
   * Fix path errors when adding torrents externally in Windows
+  * Fix localclient authentication by stripping the lines read from the auth file
   
 === Deluge 1.2.0_rc1 (07 October 2009) ===
 ==== Core ====
diff --git a/deluge/core/authmanager.py b/deluge/core/authmanager.py
index b9a2e796a..ef6fbc464 100644
--- a/deluge/core/authmanager.py
+++ b/deluge/core/authmanager.py
@@ -124,6 +124,7 @@ class AuthManager(component.Component):
             if line.startswith("#"):
                 # This is a comment line
                 continue
+            line = line.strip()
             try:
                 lsplit = line.split(":")
             except Exception, e:
diff --git a/deluge/ui/common.py b/deluge/ui/common.py
index ad9176e9e..1748f201a 100644
--- a/deluge/ui/common.py
+++ b/deluge/ui/common.py
@@ -301,6 +301,7 @@ def get_localhost_auth():
             if line.startswith("#"):
                 # This is a comment line
                 continue
+            line = line.strip()
             try:
                 lsplit = line.split(":")
             except Exception, e: