diff --git a/security/manager/pki/resources/content/editcacert.xul b/security/manager/pki/resources/content/editcacert.xul
index 698bb5e5803..2cbe89b817f 100644
--- a/security/manager/pki/resources/content/editcacert.xul
+++ b/security/manager/pki/resources/content/editcacert.xul
@@ -27,7 +27,7 @@
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
 
 <window id="editCert" 
-        title="&certmgr.editcert.title;"
+        title="&certmgr.editcacert.title;"
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="setWindowName();"
diff --git a/security/manager/pki/resources/content/editcerts.js b/security/manager/pki/resources/content/editcerts.js
index 1e21022f94b..94c4669efc9 100644
--- a/security/manager/pki/resources/content/editcerts.js
+++ b/security/manager/pki/resources/content/editcerts.js
@@ -42,8 +42,6 @@ function setWindowName()
 
   var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
   var windowReference = document.getElementById('editCert');
-  windowReference.setAttribute("title", 
-                             bundle.GetStringFromName("editTrustWindowTitle")); 
 
   var message1 = bundle.formatStringFromName("editTrustCA",
                                              [ cert.commonName ],
@@ -109,8 +107,6 @@ function doLoadForSSLCert()
 
   var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
   var windowReference = document.getElementById('editSSLCert');
-  windowReference.setAttribute("title", 
-                             bundle.GetStringFromName("editTrustWindowTitle")); 
 
   var message1 = bundle.formatStringFromName("editTrustSSL",
                                              [ cert.commonName ],
diff --git a/security/manager/pki/resources/content/editsslcert.xul b/security/manager/pki/resources/content/editsslcert.xul
index 79cce33b48c..930b5703328 100644
--- a/security/manager/pki/resources/content/editsslcert.xul
+++ b/security/manager/pki/resources/content/editsslcert.xul
@@ -27,7 +27,7 @@
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
 
 <window id="editSSLCert" 
-        title="&certmgr.editcert.title;"
+        title="&certmgr.editsslcert.title;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="doLoadForSSLCert();"
 >
diff --git a/security/manager/pki/resources/locale/en-US/certManager.dtd b/security/manager/pki/resources/locale/en-US/certManager.dtd
index b47be9e990c..6a730d21004 100644
--- a/security/manager/pki/resources/locale/en-US/certManager.dtd
+++ b/security/manager/pki/resources/locale/en-US/certManager.dtd
@@ -52,6 +52,8 @@
 <!ENTITY certmgr.certdetail.md5fingerprint "MD5 Fingerprint">
 
 <!ENTITY certmgr.editcert.title "Edit Security Certificate Settings">
+<!ENTITY certmgr.editcacert.title "Edit CA certificate trust settings">
+<!ENTITY certmgr.editsslcert.title "Edit web site certificate trust settings">
 <!ENTITY certmgr.editcert.edittrust "Edit trust settings:">
 <!ENTITY certmgr.editcert.trustssl "This certificate can identify web sites.">
 <!ENTITY certmgr.editcert.trustemail "This certificate can identify mail users.">