diff --git a/checkin_notes b/checkin_notes
index 99ef7bb06d..8ec82b0d35 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -11437,3 +11437,10 @@ Charlie 6 Sept 2005
     mac_build/
         boinc.pbproj/
             project.pbxproj
+
+Bruce 7 Sept 2005
+    - Clarify wording of important message from client to user.
+
+    client/
+        scheduler_op.C
+
diff --git a/client/scheduler_op.C b/client/scheduler_op.C
index c8db5e3408..53c8e6cec4 100644
--- a/client/scheduler_op.C
+++ b/client/scheduler_op.C
@@ -231,11 +231,34 @@ int SCHEDULER_OP::start_rpc(PROJECT* p) {
         default: why = "Unknown";
         }
         msg_printf(p, MSG_INFO,  "Reason: %s", why);
-        msg_printf(
-            p, MSG_INFO,
-            "Requesting %.0f seconds of work, returning %d results\n",
-            p->work_request, p->nresults_returned
-        );
+        if (p->work_request != 0.0 && p->nresults_returned != 0) {
+            msg_printf(
+                p, MSG_INFO,
+                (p->work_request >= 1.0) ?
+                "Requesting %.0f seconds of new work, and reporting %d results\n":
+                "Requesting %g seconds of new work, and reporting %d results\n",
+                p->work_request, p->nresults_returned
+            );
+        } else if (p->work_request != 0) {
+            msg_printf(
+                p, MSG_INFO,
+                (p->work_request >= 1.0) ?
+                "Requesting %.0f seconds of new work\n":
+                "Requesting %g seconds of new work\n",
+                p->work_request
+            );
+        } else if (p->nresults_returned != 0) {
+            msg_printf(
+                p, MSG_INFO,
+                "Reporting %d results\n",
+                p->nresults_returned
+            );
+        } else {
+            msg_printf(
+                p, MSG_INFO,
+                "Note: not requesting new work or reporting results\n"
+            );
+        }
     }
 
     get_sched_request_filename(*p, request_file);