diff --git a/checkin_notes b/checkin_notes
index 99cd2e96e4..8fa55db7e8 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -3975,3 +3975,10 @@ Rom    17 Apr 2006
         
     clientgui/
         ViewWork.cpp
+
+Walt   17 Apr 2006
+    - Bug Fix: Fix a problem where it was passing the xml tag line
+        instead of the string to xml_unescape.
+        
+    lib/
+        proxy_info.C
diff --git a/lib/proxy_info.C b/lib/proxy_info.C
index 1130cd5514..a71ef1077c 100644
--- a/lib/proxy_info.C
+++ b/lib/proxy_info.C
@@ -52,7 +52,7 @@ int PROXY_INFO::parse(MIOFILE& in) {
             continue;
         }
         else if (parse_str(buf, "<socks5_user_passwd>", buf2, 1024)) {
-            xml_unescape(buf, socks5_user_passwd);
+            xml_unescape(buf2, socks5_user_passwd);
             continue;
         }
         else if (parse_str(buf, "<http_user_name>", buf2, 1024)) {
@@ -60,7 +60,7 @@ int PROXY_INFO::parse(MIOFILE& in) {
             continue;
         }
         else if (parse_str(buf, "<http_user_passwd>", buf2, 1024)) {
-            xml_unescape(buf, http_user_passwd);
+            xml_unescape(buf2, http_user_passwd);
             continue;
         }
     }