diff --git a/checkin_notes b/checkin_notes
index 8b015671ca..734890af3e 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -17830,3 +17830,11 @@ David  27 Sept 2004
     sched/
         handle_request.C
         server_types.C,h
+
+David  27 Sept 2004
+    - still more GUI URL changes
+
+    client/
+        client_types.C
+    lib/
+        gui_rpc_client.h
diff --git a/client/client_types.C b/client/client_types.C
index a8616d7e03..c36ad804f4 100644
--- a/client/client_types.C
+++ b/client/client_types.C
@@ -458,7 +458,9 @@ int PROJECT::write_state(MIOFILE& out, bool gui_rpc) {
         deletion_policy_expire?"    <deletion_policy_expire/>\n":""
     );
 #endif
-    if (!gui_rpc) {
+    if (gui_rpc) {
+        out.printf("%s", gui_urls.c_str());
+    } else {
        for (i=0; i<scheduler_urls.size(); i++) {
             out.printf(
                 "    <scheduler_url>%s</scheduler_url>\n",
diff --git a/client/scheduler_op.C b/client/scheduler_op.C
index 0ac712145a..9c4c921d43 100644
--- a/client/scheduler_op.C
+++ b/client/scheduler_op.C
@@ -566,6 +566,10 @@ SCHEDULER_REPLY::~SCHEDULER_REPLY() {
     if (code_sign_key_signature) free(code_sign_key_signature);
 }
 
+// parse a scheduler reply.
+// Some of the items go into the SCHEDULER_REPLY object.
+// Others are copied straight to the PROJECT
+//
 int SCHEDULER_REPLY::parse(FILE* in, PROJECT* project) {
     char buf[256], *p;
     int retval, x;
diff --git a/lib/gui_rpc_client.C b/lib/gui_rpc_client.C
index 75a87d6a33..aaf3ec4c17 100644
--- a/lib/gui_rpc_client.C
+++ b/lib/gui_rpc_client.C
@@ -80,6 +80,10 @@ int PROJECT::parse(MIOFILE& in) {
             tentative = true;
             continue;
         }
+        else if (match_tag(buf, "<gui_urls>")) {
+            copy_element_contents(in, "</gui_urls>", gui_urls);
+            continue;
+        }
     }
     return ERR_XML_PARSE;
 }
@@ -99,6 +103,7 @@ void PROJECT::print() {
     printf("   master fetch pending: %s\n", master_url_fetch_pending?"yes":"no");
     printf("   scheduler RPC pending: %s\n", sched_rpc_pending?"yes":"no");
     printf("   tentative: %s\n", tentative?"yes":"no");
+    printf("   gui_urls: %s\n", gui_urls.c_str());
 }
 
 void PROJECT::clear() {
@@ -117,6 +122,7 @@ void PROJECT::clear() {
     master_url_fetch_pending = false;
     sched_rpc_pending = false;
     tentative = false;
+    gui_urls = "";
 }
 
 APP::APP() {
diff --git a/lib/gui_rpc_client.h b/lib/gui_rpc_client.h
index 6f8e2cc173..0d5f649725 100644
--- a/lib/gui_rpc_client.h
+++ b/lib/gui_rpc_client.h
@@ -38,6 +38,7 @@ public:
     std::string project_name;
     std::string user_name;
     std::string team_name;
+    std::string gui_urls;
     double user_total_credit;
     double user_expavg_credit;
     double host_total_credit;      // as reported by server