diff --git a/checkin_notes b/checkin_notes
index 1d27e517ba..59cf73b61b 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -223,3 +223,11 @@ David  19 Jan 2011
         rr_sim.cpp
         app_control.cpp
         cpu_sched.cpp
+
+David  19 Jan 2011
+    - client: if we're using an acct mgr,
+        and we're attached to a project manually (not via acct mgr)
+        and the acct mgr tells us to detach from it, don't.
+
+    client/
+        acct_mgr.cpp
diff --git a/client/acct_mgr.cpp b/client/acct_mgr.cpp
index 16a297cd80..43134afdaf 100644
--- a/client/acct_mgr.cpp
+++ b/client/acct_mgr.cpp
@@ -481,7 +481,9 @@ void ACCT_MGR_OP::handle_reply(int http_op_retval) {
             pp = gstate.lookup_project(acct.url.c_str());
             if (pp) {
                 if (acct.detach) {
-                    gstate.detach_project(pp);
+                    if (pp->attached_via_acct_mgr) {
+                        gstate.detach_project(pp);
+                    }
                 } else {
                     // BAM! leaves authenticator blank if our request message
                     // had the current account info