diff --git a/checkin_notes b/checkin_notes
index ad5e6f401e..05f748a6dd 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -2817,3 +2817,12 @@ David  13 Apr 2010
         boinc_db.cpp,h
     sched/
         most files
+
+David  15 Apr 2010
+	- client: get rid of spurious "Using proxy settings from GUI" message
+
+	client/
+		cs_prefs.cpp
+		gui_rpc_server_ops.cpp
+	lib/
+		proxy_info.cpp
diff --git a/client/cs_prefs.cpp b/client/cs_prefs.cpp
index 3cfa0aea0c..db620624ce 100644
--- a/client/cs_prefs.cpp
+++ b/client/cs_prefs.cpp
@@ -458,10 +458,7 @@ void CLIENT_STATE::read_global_prefs() {
     file_xfers->set_bandwidth_limits(true);
     file_xfers->set_bandwidth_limits(false);
     msg_printf(NULL, MSG_INFO,
-        "   (to change, visit the web site of an attached project,"
-    );
-    msg_printf(NULL, MSG_INFO,
-        "   or click on Preferences)"
+        "   (to change preferences, visit the web site of an attached project, or select Preferences in the Manager)"
     );
     request_schedule_cpus("Prefs update");
     request_work_fetch("Prefs update");
diff --git a/client/gui_rpc_server_ops.cpp b/client/gui_rpc_server_ops.cpp
index 9379e2d8b6..a61e59c1a2 100644
--- a/client/gui_rpc_server_ops.cpp
+++ b/client/gui_rpc_server_ops.cpp
@@ -371,9 +371,6 @@ static void handle_set_proxy_settings(char* buf, MIOFILE& fout) {
     MIOFILE in;
     in.init_buf_read(buf);
     gui_proxy_info.parse(in);
-    if (!strlen(gui_proxy_info.http_server_name) && !strlen(gui_proxy_info.socks_server_name)) {
-        gui_proxy_info.present = false;
-    }
     gstate.set_client_state_dirty("Set proxy settings RPC");
     fout.printf("<success/>\n");
     select_proxy_info();
diff --git a/lib/proxy_info.cpp b/lib/proxy_info.cpp
index c6115fd9f2..26f2699d23 100644
--- a/lib/proxy_info.cpp
+++ b/lib/proxy_info.cpp
@@ -33,7 +33,9 @@ int PROXY_INFO::parse(MIOFILE& in) {
     memset(this, 0, sizeof(PROXY_INFO));
     while (in.fgets(buf, 256)) {
         if (match_tag(buf, "</proxy_info>")) {
-            present = true;
+            present = false;
+            if (strlen(http_server_name)) present = true;
+            if (strlen(socks_server_name)) present = true;
             return 0;
         }
         else if (parse_bool(buf, "use_http_proxy", use_http_proxy)) continue;