diff --git a/chrome/content/zotero/bibliography.js b/chrome/content/zotero/bibliography.js
index 0a592e96a..a8180e7bd 100644
--- a/chrome/content/zotero/bibliography.js
+++ b/chrome/content/zotero/bibliography.js
@@ -112,7 +112,7 @@ var Zotero_File_Interface_Bibliography = new function() {
 			
 			// add border on Windows
 			if(Zotero.isWin) {
-				document.getElementById("zotero-bibliography-container").style.border = "1px solid black";
+				document.getElementById("doc-prefs-dialog").style.border = "1px solid black";
 			}
 		}
 		window.sizeToContent();
diff --git a/chrome/content/zotero/integrationDocPrefs.xul b/chrome/content/zotero/integrationDocPrefs.xul
index 1ed6be663..eba2c736e 100644
--- a/chrome/content/zotero/integrationDocPrefs.xul
+++ b/chrome/content/zotero/integrationDocPrefs.xul
@@ -5,7 +5,7 @@
 <!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
 
 <dialog
-	id="add-citation-dialog"
+	id="doc-prefs-dialog"
 	orient="vertical"
 	buttons="accept"
 	title="&zotero.integration.docPrefs.title;"
diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
index f1409f929..dc85e93df 100644
--- a/chrome/content/zotero/xpcom/integration.js
+++ b/chrome/content/zotero/xpcom/integration.js
@@ -454,7 +454,7 @@ Zotero.Integration.SOAP = new function() {
 	 */
 	function restoreSession(vars) {
 		if(!vars || !_checkVersion(vars[0])) {
-			return "ERROR:"+Zotero.getString("integration.incompatibleVersion");
+			return "ERROR:"+Zotero.getString("integration.incompatibleVersion", Zotero.version);
 		}
 
 		try {
@@ -490,7 +490,7 @@ Zotero.Integration.SOAP = new function() {
 	 */
 	function setDocPrefs(vars) {
 		if(!vars || !vars.length || !_checkVersion(vars[1])) {
-			return "ERROR:"+Zotero.getString("integration.incompatibleVersion");
+			return "ERROR:"+Zotero.getString("integration.incompatibleVersion", Zotero.version);
 		}
 		
 		var io = new function() {
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index 74d16bdc4..db108577f 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -476,7 +476,7 @@ annotations.collapse.tooltip		= Collapse Annotation
 annotations.expand.tooltip			= Expand Annotation
 annotations.oneWindowWarning		= Annotations for a snapshot may only be opened in one browser window simultaneously. This snapshot will be opened without annotations.
 
-integration.incompatibleVersion		= This version of the Zotero Word plug-in is incompatible with the currently installed version of the Zotero Firefox extension. Please ensure you are using the latest versions of both components.
+integration.incompatibleVersion		= This version of the Zotero Word plug-in ($INTEGRATION_VERSION) is incompatible with the currently installed version of the Zotero Firefox extension (%1$S). Please ensure you are using the latest versions of both components.
 integration.fields.label			= Fields
 integration.referenceMarks.label	= ReferenceMarks
 integration.fields.caption			= Microsoft Word Fields are less likely to be accidentally modified, but cannot be shared with OpenOffice.org.