diff --git a/extensions/cck/browser/resources/content/cckwizard/cckwizard.js b/extensions/cck/browser/resources/content/cckwizard/cckwizard.js
index 0f63f594d02b..cf370416d42d 100755
--- a/extensions/cck/browser/resources/content/cckwizard/cckwizard.js
+++ b/extensions/cck/browser/resources/content/cckwizard/cckwizard.js
@@ -137,7 +137,7 @@ function DeleteConfig()
 {
   var bundle = document.getElementById("bundle_cckwizard");
 
-  var button = gPromptService.confirmEx(window, "WizardMachine", bundle.getString("deleteConfirm"),
+  var button = gPromptService.confirmEx(window, bundle.getString("windowTitle"), bundle.getString("deleteConfirm"),
                                         gPromptService.BUTTON_TITLE_YES * gPromptService.BUTTON_POS_0 +
                                         gPromptService.BUTTON_TITLE_NO * gPromptService.BUTTON_POS_1,
                                         null, null, null, null, {});
@@ -253,7 +253,7 @@ function CloseCCKWizard()
   if (!saveOnExit) {
     var bundle = document.getElementById("bundle_cckwizard");
 
-    var button = gPromptService.confirmEx(window, "WizardMachine", bundle.getString("cancelConfirm"),
+    var button = gPromptService.confirmEx(window, bundle.getString("windowTitle"), bundle.getString("cancelConfirm"),
                                           gPromptService.BUTTON_TITLE_YES * gPromptService.BUTTON_POS_0 +
                                           gPromptService.BUTTON_TITLE_NO * gPromptService.BUTTON_POS_1,
                                           null, null, null, null, {});
@@ -1095,7 +1095,7 @@ function CCKWriteProperties(destdir)
       var file = Components.classes["@mozilla.org/file/local;1"]
                            .createInstance(Components.interfaces.nsILocalFile);
       file.initWithPath(certpath);
-      var line = "Cert"+i+"="+file.leafName;
+      var line = "Cert"+ i + "=" + file.leafName + "\n";
       fos.write(line, line.length);
     }
   }  
diff --git a/extensions/cck/browser/resources/content/cckwizard/cckwizard.xul b/extensions/cck/browser/resources/content/cckwizard/cckwizard.xul
index 7f878010c5d7..719fabce47f0 100755
--- a/extensions/cck/browser/resources/content/cckwizard/cckwizard.xul
+++ b/extensions/cck/browser/resources/content/cckwizard/cckwizard.xul
@@ -76,9 +76,10 @@
        <button label="&copyConfig.label;" id="copyconfig" oncommand="CopyConfig();"/>/>
        <button label="&deleteConfig.label;" id="deleteconfig" oncommand="DeleteConfig();"/>
      </hbox>
+     <checkbox id="saveOnExit" label="&saveOnExit.label;" oncommand="SetSaveOnExitPref();"/>
    </groupbox>
    <vbox>
-   <checkbox id="saveOnExit" label="&saveOnExit.label;" oncommand="SetSaveOnExitPref();"/>
+  
     <description>&zipLocation.label;</description>
 
          <hbox align="center">