diff --git a/mozilla/security/manager/pki/resources/content/certManager.js b/mozilla/security/manager/pki/resources/content/certManager.js
index 56060c781bb..cbeb86a6d83 100644
--- a/mozilla/security/manager/pki/resources/content/certManager.js
+++ b/mozilla/security/manager/pki/resources/content/certManager.js
@@ -314,39 +314,42 @@ function restoreCerts()
 function deleteCerts()
 {
   getSelectedCerts();
-  
+
   var params = Components.classes[nsDialogParamBlock].createInstance(nsIDialogParamBlock);
   
   var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
   var selTab = document.getElementById('certMgrTabbox').selectedItem;
   var selTabID = selTab.getAttribute('id');
+  var numcerts = selected_certs.length;
+
+  params.SetNumberStrings(numcerts+1);
+
   if (selTabID == 'mine_tab') 
   {
-    params.SetString(1,bundle.GetStringFromName("deleteUserCertFlag"));
+    params.SetString(0,bundle.GetStringFromName("deleteUserCertFlag"));
   } 
   else if (selTabID == "websites_tab") 
   {
-    params.SetString(1,bundle.GetStringFromName("deleteSslCertFlag"));
+    params.SetString(0,bundle.GetStringFromName("deleteSslCertFlag"));
   } 
   else if (selTabID == "ca_tab") 
   {
-    params.SetString(1,bundle.GetStringFromName("deleteCaCertFlag"));
+    params.SetString(0,bundle.GetStringFromName("deleteCaCertFlag"));
   }
   else if (selTabID == "others_tab") 
   {
-    params.SetString(1,bundle.GetStringFromName("deleteEmailCertFlag"));
+    params.SetString(0,bundle.GetStringFromName("deleteEmailCertFlag"));
   }
   else
   {
     return;
   }
 
-  var numcerts = selected_certs.length;
-  params.SetInt(2,numcerts);
+  params.SetInt(0,numcerts);
   for (var t=0; t<numcerts; t++) 
   {
     var cert = selected_certs[t];
-    params.SetString(t+3, cert.dbKey);  
+    params.SetString(t+1, cert.dbKey);  
   }
    
   window.openDialog('chrome://pippki/content/deletecert.xul', "",
diff --git a/mozilla/security/manager/pki/resources/content/certpicker.js b/mozilla/security/manager/pki/resources/content/certpicker.js
index fd08829e097..bf7e43e5da7 100644
--- a/mozilla/security/manager/pki/resources/content/certpicker.js
+++ b/mozilla/security/manager/pki/resources/content/certpicker.js
@@ -44,19 +44,19 @@ function onLoad()
 {
   dialogParams = window.arguments[0].QueryInterface(nsIDialogParamBlock);
 
-  var pickerTitle = dialogParams.GetString(1);
+  var pickerTitle = dialogParams.GetString(0);
   var mainwin = document.getElementById("certPicker");
   mainwin.setAttribute("title", pickerTitle);
 
-  var pickerInfo = dialogParams.GetString(2);
+  var pickerInfo = dialogParams.GetString(1);
   setText("pickerInfo", pickerInfo);
 
   var selectElement = document.getElementById("nicknames");
-  itemCount = dialogParams.GetInt(1);
+  itemCount = dialogParams.GetInt(0);
 
   for (var i=0; i < itemCount; i++) {
       var menuItemNode = document.createElement("menuitem");
-      var nick = dialogParams.GetString(i+3);
+      var nick = dialogParams.GetString(i+2);
       menuItemNode.setAttribute("value", i);
       menuItemNode.setAttribute("label", nick); // this is displayed
       selectElement.firstChild.appendChild(menuItemNode);
@@ -65,14 +65,14 @@ function onLoad()
       }
   }
 
-  dialogParams.SetInt(1,0); // set cancel return value
+  dialogParams.SetInt(0,0); // set cancel return value
   setDetails();
 }
 
 function setDetails()
 {
   var index = parseInt(document.getElementById("nicknames").value);
-  details = dialogParams.GetString(index+itemCount+3);
+  details = dialogParams.GetString(index+itemCount+2);
   document.getElementById("details").value = details;
 }
 
@@ -83,14 +83,14 @@ function onCertSelected()
 
 function doOK()
 {
-  dialogParams.SetInt(1,1);
+  dialogParams.SetInt(0,1);
   var index = parseInt(document.getElementById("nicknames").value);
-  dialogParams.SetInt(2, index);
+  dialogParams.SetInt(1, index);
   window.close();
 }
 
 function doCancel()
 {
-  dialogParams.SetInt(1,0);
+  dialogParams.SetInt(0,0);
   window.close();
 }
diff --git a/mozilla/security/manager/pki/resources/content/choosetoken.js b/mozilla/security/manager/pki/resources/content/choosetoken.js
index 478a5619ab4..ff480989a6c 100644
--- a/mozilla/security/manager/pki/resources/content/choosetoken.js
+++ b/mozilla/security/manager/pki/resources/content/choosetoken.js
@@ -30,13 +30,14 @@ function onLoad()
 {
     dialogParams = window.arguments[0].QueryInterface(nsIDialogParamBlock);
     var selectElement = document.getElementById("tokens");
-    for (var i=1; i <= dialogParams.GetInt(1); i++) {
+    var aCount = dialogParams.GetInt(0);
+    for (var i=0; i < aCount; i++) {
         var menuItemNode = document.createElement("menuitem");
         var token = dialogParams.GetString(i);
         menuItemNode.setAttribute("value", token);
         menuItemNode.setAttribute("label", token);
         selectElement.firstChild.appendChild(menuItemNode);
-        if (i == 1) {
+        if (i == 0) {
             selectElement.selectedItem = menuItemNode;
         }
     }
@@ -46,13 +47,13 @@ function doOK()
 {
   var tokenList = document.getElementById("tokens");
   var token = tokenList.value;
-  dialogParams.SetInt(1,1);
-  dialogParams.SetString(1, token);
+  dialogParams.SetInt(0,1);
+  dialogParams.SetString(0, token);
   window.close();
 }
 
 function doCancel()
 {
-  dialogParams.SetInt(1,0);
+  dialogParams.SetInt(0,0);
   window.close();
 }
diff --git a/mozilla/security/manager/pki/resources/content/clientauthask.js b/mozilla/security/manager/pki/resources/content/clientauthask.js
index 471871bf6d2..fdef06c3938 100644
--- a/mozilla/security/manager/pki/resources/content/clientauthask.js
+++ b/mozilla/security/manager/pki/resources/content/clientauthask.js
@@ -34,9 +34,9 @@ function onLoad()
     var issuer;
 
     dialogParams = window.arguments[0].QueryInterface(nsIDialogParamBlock);
-    cn = dialogParams.GetString(1);
-    org = dialogParams.GetString(2);
-    issuer = dialogParams.GetString(3);
+    cn = dialogParams.GetString(0);
+    org = dialogParams.GetString(1);
+    issuer = dialogParams.GetString(2);
 
     var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
     var message1 = bundle.formatStringFromName("clientAuthMessage1", 
@@ -50,10 +50,10 @@ function onLoad()
     setText("issuer", message2);
 
     var selectElement = document.getElementById("nicknames");
-    itemCount = dialogParams.GetInt(1);
+    itemCount = dialogParams.GetInt(0);
     for (var i=0; i < itemCount; i++) {
         var menuItemNode = document.createElement("menuitem");
-        var nick = dialogParams.GetString(i+4);
+        var nick = dialogParams.GetString(i+3);
         menuItemNode.setAttribute("value", i);
         menuItemNode.setAttribute("label", nick); // this is displayed
         selectElement.firstChild.appendChild(menuItemNode);
@@ -68,7 +68,7 @@ function onLoad()
 function setDetails()
 {
   var index = parseInt(document.getElementById("nicknames").value);
-  details = dialogParams.GetString(index+itemCount+4);
+  details = dialogParams.GetString(index+itemCount+3);
   document.getElementById("details").value = details;
 }
 
@@ -79,14 +79,14 @@ function onCertSelected()
 
 function doOK()
 {
-  dialogParams.SetInt(1,1);
+  dialogParams.SetInt(0,1);
   var index = parseInt(document.getElementById("nicknames").value);
-  dialogParams.SetInt(2, index);
+  dialogParams.SetInt(1, index);
   window.close();
 }
 
 function doCancel()
 {
-  dialogParams.SetInt(1,0);
+  dialogParams.SetInt(0,0);
   window.close();
 }
diff --git a/mozilla/security/manager/pki/resources/content/clientauthask.xul b/mozilla/security/manager/pki/resources/content/clientauthask.xul
index 85649e89cc5..24a864fbd53 100644
--- a/mozilla/security/manager/pki/resources/content/clientauthask.xul
+++ b/mozilla/security/manager/pki/resources/content/clientauthask.xul
@@ -35,7 +35,7 @@
 <keyset id="keys">
   <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK();"/>
   <key id="return-key" keycode="VK_RETURN" oncommand="doOK();"/>
-  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
+  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="doCancel();"/>
 </keyset>
 
 <vbox style="margin: 5px;">
diff --git a/mozilla/security/manager/pki/resources/content/deletecert.js b/mozilla/security/manager/pki/resources/content/deletecert.js
index fbe6a6810cc..fc689678004 100644
--- a/mozilla/security/manager/pki/resources/content/deletecert.js
+++ b/mozilla/security/manager/pki/resources/content/deletecert.js
@@ -37,12 +37,12 @@ function setWindowName()
   //  Get the cert from the cert database
   certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
   
-  var typeFlag = params.GetString(1);
-  var numberOfCerts = params.GetInt(2);
+  var typeFlag = params.GetString(0);
+  var numberOfCerts = params.GetInt(0);
   var dbkey;
   for(var x=0; x<numberOfCerts;x++)
   {
-     dbkey = params.GetString(x+3);
+     dbkey = params.GetString(x+1);
      certs[x] = certdb.getCertByDBKey(dbkey , null);
   }
   
diff --git a/mozilla/security/manager/pki/resources/content/escrowWarn.xul b/mozilla/security/manager/pki/resources/content/escrowWarn.xul
index d9cff9b06d4..59e2aa4bc6e 100644
--- a/mozilla/security/manager/pki/resources/content/escrowWarn.xul
+++ b/mozilla/security/manager/pki/resources/content/escrowWarn.xul
@@ -31,9 +31,9 @@
 <script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
 <keyset id="keys">
-  <key id="enter-key"  keycode="VK_ENTER"  oncommand="getPassword();"/>
-  <key id="return-key" keycode="VK_RETURN" oncommand="getPassword();"/>
-  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
+  <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK();"/>
+  <key id="return-key" keycode="VK_RETURN" oncommand="doOK();"/>
+  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="doCancel();"/>
 </keyset>
 
 <vbox style="margin: 5px;" flex="1">
diff --git a/mozilla/security/manager/pki/src/nsNSSDialogs.cpp b/mozilla/security/manager/pki/src/nsNSSDialogs.cpp
index fd72ecc6e14..dd456507f35 100644
--- a/mozilla/security/manager/pki/src/nsNSSDialogs.cpp
+++ b/mozilla/security/manager/pki/src/nsNSSDialogs.cpp
@@ -750,26 +750,26 @@ nsNSSDialogs::ChooseCertificate(nsIInterfaceRequestor *ctx, const PRUnichar *cn,
 
   block->SetNumberStrings(4+count*2);
 
-  rv = block->SetString(1, cn);
+  rv = block->SetString(0, cn);
   if (NS_FAILED(rv)) return rv;
 
-  rv = block->SetString(2, organization);
+  rv = block->SetString(1, organization);
   if (NS_FAILED(rv)) return rv;
 
-  rv = block->SetString(3, issuer);
+  rv = block->SetString(2, issuer);
   if (NS_FAILED(rv)) return rv;
 
   for (i = 0; i < count; i++) {
-	  rv = block->SetString(i+4, certNickList[i]);
+	  rv = block->SetString(i+3, certNickList[i]);
 	  if (NS_FAILED(rv)) return rv;
   }
 
   for (i = 0; i < count; i++) {
-	  rv = block->SetString(i+count+4, certDetailsList[i]);
+	  rv = block->SetString(i+count+3, certDetailsList[i]);
 	  if (NS_FAILED(rv)) return rv;
   }
 
-  rv = block->SetInt(1, count);
+  rv = block->SetInt(0, count);
   if (NS_FAILED(rv)) return rv;
 
   rv = nsNSSDialogHelper::openDialog(nsnull,
@@ -779,13 +779,13 @@ nsNSSDialogs::ChooseCertificate(nsIInterfaceRequestor *ctx, const PRUnichar *cn,
 
   PRInt32 status;
 
-  rv = block->GetInt(1, &status);
+  rv = block->GetInt(0, &status);
   if (NS_FAILED(rv)) return rv;
 
   *canceled = (status == 0)?PR_TRUE:PR_FALSE;
   if (!*canceled) {
     // retrieve the nickname
-    rv = block->GetInt(2, selectedIndex);
+    rv = block->GetInt(1, selectedIndex);
   }
   return rv;
 }
@@ -807,23 +807,23 @@ nsNSSDialogs::PickCertificate(nsIInterfaceRequestor *ctx, const PRUnichar *title
 
   block->SetNumberStrings(3+count*2);
 
-  rv = block->SetString(1, title);
+  rv = block->SetString(0, title);
   if (NS_FAILED(rv)) return rv;
 
-  rv = block->SetString(2, infoPrompt);
+  rv = block->SetString(1, infoPrompt);
   if (NS_FAILED(rv)) return rv;
 
   for (i = 0; i < count; i++) {
-	  rv = block->SetString(i+3, certNickList[i]);
+	  rv = block->SetString(i+2, certNickList[i]);
 	  if (NS_FAILED(rv)) return rv;
   }
 
   for (i = 0; i < count; i++) {
-	  rv = block->SetString(i+count+3, certDetailsList[i]);
+	  rv = block->SetString(i+count+2, certDetailsList[i]);
 	  if (NS_FAILED(rv)) return rv;
   }
 
-  rv = block->SetInt(1, count);
+  rv = block->SetInt(0, count);
   if (NS_FAILED(rv)) return rv;
 
   rv = nsNSSDialogHelper::openDialog(nsnull,
@@ -833,12 +833,12 @@ nsNSSDialogs::PickCertificate(nsIInterfaceRequestor *ctx, const PRUnichar *title
 
   PRInt32 status;
 
-  rv = block->GetInt(1, &status);
+  rv = block->GetInt(0, &status);
   if (NS_FAILED(rv)) return rv;
 
   *canceled = (status == 0)?PR_TRUE:PR_FALSE;
   if (!*canceled) {
-    rv = block->GetInt(2, selectedIndex);
+    rv = block->GetInt(1, selectedIndex);
   }
   return rv;
 }
@@ -960,11 +960,11 @@ nsNSSDialogs::ChooseToken(nsIInterfaceRequestor *aCtx, const PRUnichar **aTokenL
   block->SetNumberStrings(aCount);
 
   for (i = 0; i < aCount; i++) {
-	  rv = block->SetString(i+1, aTokenList[i]);
+	  rv = block->SetString(i, aTokenList[i]);
 	  if (NS_FAILED(rv)) return rv;
   }
 
-  rv = block->SetInt(1, aCount);
+  rv = block->SetInt(0, aCount);
   if (NS_FAILED(rv)) return rv;
 
   rv = nsNSSDialogHelper::openDialog(nsnull,
@@ -974,13 +974,13 @@ nsNSSDialogs::ChooseToken(nsIInterfaceRequestor *aCtx, const PRUnichar **aTokenL
 
   PRInt32 status;
 
-  rv = block->GetInt(1, &status);
+  rv = block->GetInt(0, &status);
   if (NS_FAILED(rv)) return rv;
 
   *aCanceled = (status == 0)?PR_TRUE:PR_FALSE;
   if (!*aCanceled) {
     // retrieve the nickname
-    rv = block->GetString(1, aTokenChosen);
+    rv = block->GetString(0, aTokenChosen);
   }
   return rv;
 }