diff --git a/client/prefs.C b/client/prefs.C
index ee4fe2bbe9..5384872f49 100644
--- a/client/prefs.C
+++ b/client/prefs.C
@@ -34,8 +34,8 @@
 // if there are no global prefs yet
 //
 void GLOBAL_PREFS::init() {
-    run_on_batteries = true;
-    run_if_user_active = true;
+    run_on_batteries = false;
+    run_if_user_active = false;
     start_hour = 0;
     end_hour = 0;
     run_minimized = false;
diff --git a/client/win/wingui_mainwindow.cpp b/client/win/wingui_mainwindow.cpp
index f5c5c94b70..34fbef35e3 100755
--- a/client/win/wingui_mainwindow.cpp
+++ b/client/win/wingui_mainwindow.cpp
@@ -248,21 +248,16 @@ void CMainWindow::UpdateGUI(CLIENT_STATE* pcs)
 			case RESULT_NEW:
 				strBuf.Format(g_szMiscItems[0]); break;
 			case RESULT_FILES_DOWNLOADED:
-				if (at)
-					strBuf.Format(g_szMiscItems[1]);
-				else
-					strBuf.Format(g_szMiscItems[2]);
+				if (at) strBuf.Format(g_szMiscItems[1]);
+				else strBuf.Format(g_szMiscItems[2]);
 				break;
 			case RESULT_COMPUTE_DONE:
 				strBuf.Format(g_szMiscItems[3]); break;
 			default:
-				if (re->server_ack) {
-					strBuf.Format(g_szMiscItems[5]); break;
-				} else if (re->ready_to_ack) {
-					strBuf.Format(g_szMiscItems[4]); break;
-				} else {
-					strBuf.Format(g_szMiscItems[6]); break;
-				}
+				if (re->server_ack) strBuf.Format(g_szMiscItems[5]);
+				else if (re->ready_to_ack) strBuf.Format(g_szMiscItems[4]);
+				else strBuf.Format(g_szMiscItems[6]);
+				break;
 		}
 		m_ResultListCtrl.SetItemText(i, 6, strBuf);
 	}
diff --git a/todo b/todo
index 9347c754da..c7d732787d 100755
--- a/todo
+++ b/todo
@@ -1,7 +1,6 @@
 -----------------------
 BUGS (arranged from high to low priority)
 -----------------------
-- global battery/user active prefs are always true in the client
 - GUI client should display "Upload failed" and "Download failed"
     in transfers tab when failure occurs
 - GUI: Result status should say "downloading files", "uploading files", etc.