diff --git a/mozilla/cck/firefox/cckwizard/chrome/cckwizard/content/cckwizard/cckwizard.js b/mozilla/cck/firefox/cckwizard/chrome/cckwizard/content/cckwizard/cckwizard.js
index e6b8c845d92..5cd2172d27e 100755
--- a/mozilla/cck/firefox/cckwizard/chrome/cckwizard/content/cckwizard/cckwizard.js
+++ b/mozilla/cck/firefox/cckwizard/chrome/cckwizard/content/cckwizard/cckwizard.js
@@ -1115,13 +1115,15 @@ function CCKReadConfigFile(srcdir)
   do {
     var more = lis.readLine(line);
     var str = line.value;
-    var linearray = str.split("=");
-    if (linearray[0].length) {
-      document.getElementById(linearray[0]).value = linearray[1];
-      if (linearray[0] == "ProxyType") {
+    var equals = str.indexOf('=');
+    if (equals != -1) {
+      firstpart = str.substring(0,equals);
+      secondpart = str.substring(equals+1);
+      document.getElementById(firstpart).value = secondpart;
+      if (firstpart == "ProxyType") {
         DoEnabling();
       }
-      if (linearray[0] == "shareAllProxies") {
+      if (firstpart == "shareAllProxies") {
         toggleProxySettings();
       }
     }
diff --git a/mozilla/cck/firefox/cckwizard/chrome/cckwizard/content/cckwizard/cckwizard.xul b/mozilla/cck/firefox/cckwizard/chrome/cckwizard/content/cckwizard/cckwizard.xul
index 7e7095f1ea9..59b197246df 100755
--- a/mozilla/cck/firefox/cckwizard/chrome/cckwizard/content/cckwizard/cckwizard.xul
+++ b/mozilla/cck/firefox/cckwizard/chrome/cckwizard/content/cckwizard/cckwizard.xul
@@ -601,7 +601,11 @@
     <groupbox>
       <caption label="Certificates"/>
       <description>
-        You may select up to five certificates to be preinstalled.
+        You may select up to five certificates to be preinstalled.<html:br/><html:br/>
+        <html:b>IMPORTANT: If you add certificates to Firefox, you CANNOT
+        ship a browser outside of your company or institution and call it Firefox.
+        This feature is intended primarily for corporate and institutional users
+        that will be deploying Firefox inside their organization.</html:b>
       </description>
       <hbox>
         <textbox readonly="true" id="CertPath1" flex="1"/>
diff --git a/mozilla/cck/firefox/cckwizard/chrome/cckwizard/content/cckwizard/srcfiles/install.rdf.in b/mozilla/cck/firefox/cckwizard/chrome/cckwizard/content/cckwizard/srcfiles/install.rdf.in
index 6d8302cf254..dddf1689a2b 100755
--- a/mozilla/cck/firefox/cckwizard/chrome/cckwizard/content/cckwizard/srcfiles/install.rdf.in
+++ b/mozilla/cck/firefox/cckwizard/chrome/cckwizard/content/cckwizard/srcfiles/install.rdf.in
@@ -16,7 +16,7 @@ xmlns:em="http://www.mozilla.org/2004/em-rdf#">
             <Description>
                 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
                 <em:minVersion>1.0+</em:minVersion>
-                <em:maxVersion>1.5</em:maxVersion>
+                <em:maxVersion>1.5.0.*</em:maxVersion>
             </Description>
         </em:targetApplication>