diff --git a/chrome/content/zotero/preferences/preferences.js b/chrome/content/zotero/preferences/preferences.js
index 5e71b46b3d..a4f68fb3cb 100644
--- a/chrome/content/zotero/preferences/preferences.js
+++ b/chrome/content/zotero/preferences/preferences.js
@@ -1295,9 +1295,13 @@ Zotero_Preferences.Debug_Output = {
 	
 	
 	toggleStore: function () {
-		var storing = Zotero.Debug.storing;
-		Zotero.Debug.setStore(!storing);
-		if (!storing) {
+		this.setStore(!Zotero.Debug.storing);
+	},
+	
+	
+	setStore: function (set) {
+		Zotero.Debug.setStore(set);
+		if (set) {
 			this._initTimer();
 		}
 		else {
@@ -1336,6 +1340,7 @@ Zotero_Preferences.Debug_Output = {
 		
 		var url = "http://www.zotero.org/repo/report?debug=1";
 		var output = Zotero.Debug.get();
+		Zotero_Preferences.Debug_Output.setStore(false);
 		
 		var uploadCallback = function (xmlhttp) {
 			document.getElementById('debug-output-submit').disabled = false;
@@ -1367,7 +1372,7 @@ Zotero_Preferences.Debug_Output = {
 			var reportID = reported[0].getAttribute('reportID');
 			ps.alert(
 				null,
-				"Submitted",
+				"Debug Output Submitted",
 				"Debug output has been sent to the Zotero server.\n\n"
 					+ "The Debug ID is D" + reportID + "."
 			);
diff --git a/chrome/content/zotero/xpcom/debug.js b/chrome/content/zotero/xpcom/debug.js
index dacbd8dce9..39a474ad2b 100644
--- a/chrome/content/zotero/xpcom/debug.js
+++ b/chrome/content/zotero/xpcom/debug.js
@@ -39,6 +39,9 @@ Zotero.Debug = new function () {
 	this.init = function () {
 		_console = Zotero.Prefs.get('debug.log');
 		_store = Zotero.Prefs.get('debug.store');
+		if (_store) {
+			Zotero.Prefs.set('debug.store', false);
+		}
 		_level = Zotero.Prefs.get('debug.level');
 		_time = Zotero.Prefs.get('debug.time');
 	}