diff --git a/checkin_notes b/checkin_notes
index 95749e5e58..b792159039 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -2149,3 +2149,10 @@ Rom    24 Feb 2012
         
     clientgui/
         ViewWork.cpp
+
+David  24 Feb 2012
+    - client: amend checkin of 18 Feb to not request work if
+        work buffer is above upper limit
+
+    client/
+        work_fetch.cpp
diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp
index 5b30853a05..bca585b921 100644
--- a/client/work_fetch.cpp
+++ b/client/work_fetch.cpp
@@ -222,6 +222,8 @@ PROJECT* RSC_WORK_FETCH::choose_project_hyst(bool enforce_hyst) {
     if (enforce_hyst) {
         if (saturated_time > gstate.work_buf_min()) return NULL;
     }
+    if (saturated_time > gstate.work_buf_total()) return NULL;
+
     for (unsigned i=0; i<gstate.projects.size(); i++) {
         PROJECT* p = gstate.projects[i];
         if (!p->pwf.can_fetch_work) continue;
diff --git a/html/user/create_account_form.php b/html/user/create_account_form.php
index a780dde0ca..e184624c38 100644
--- a/html/user/create_account_form.php
+++ b/html/user/create_account_form.php
@@ -48,12 +48,10 @@ if (parse_bool($config, "disable_account_creation")) {
 }
 
 $nwac = parse_bool($config, "no_web_account_creation");
-if ($nwac) {
+if (!$nwac && !no_computing()) {
     echo "<p>
-        <b>".tra("Don't use this form. Just run BOINC, select Add Project, and enter an email address and password.")."</b></p>
+        <b>".tra("NOTE: If you use the BOINC Manager, don't use this form. Just run BOINC, select Add Project, and enter an email address and password.")."</b></p>
     ";
-    page_tail();
-    exit();
 }
 
 echo "