diff --git a/mozilla/mailnews/base/prefs/resources/content/AccountWizard.js b/mozilla/mailnews/base/prefs/resources/content/AccountWizard.js
index 1c8215615e0..c9ca94ed29d 100644
--- a/mozilla/mailnews/base/prefs/resources/content/AccountWizard.js
+++ b/mozilla/mailnews/base/prefs/resources/content/AccountWizard.js
@@ -47,6 +47,7 @@ function onLoad() {
         smtpService =
             Components.classes["component://netscape/messengercompose/smtp"].getService(Components.interfaces.nsISmtpService);;
 
+    init();
     try {
 	wizardContents["smtp.hostname"] = smtpService.defaultServer.hostname;
 	dump("initialized with " + wizardContents["smtp.hostname"] + "\n");
@@ -54,13 +55,13 @@ function onLoad() {
     catch (ex) {
 	//dump("failed to get the smtp hostname\n");
     }
-    init();
 }
 
 function wizardPageLoaded(tag) {
     init();
     currentPageTag=tag;
     initializePage(contentWindow, wizardContents);
+    updateButtons(wizardMap[currentPageTag], window.parent);
 }
 
 function onNext(event) {
@@ -82,6 +83,7 @@ function onNext(event) {
     saveContents(contentWindow, wizardContents);
     
     nextPage(contentWindow);
+
 }
 
 function onCancel(event) {
@@ -102,13 +104,25 @@ function getUrlFromTag(title) {
 }
 
 
-// helper functions that actually do stuff
-function setNextEnabled(enabled) {
-    
+function setNextText(doc, hasNext) {
+    if (hasNext)
+        doc.getElementById("nextButton").setAttribute("value", "Next >");
+    else
+        doc.getElementById("nextButton").setAttribute("value", "Finish");
+
+}
+function setNextEnabled(doc, enabled) {
+    if (enabled)
+        doc.getElementById("nextButton").removeAttribute("disabled");
+    else
+        doc.getElementById("nextButton").setAttribute("disabled", "true");
 }
 
-function setBackEnabled(enabled) {
-
+function setBackEnabled(doc, enabled) {
+    if (enabled)
+        doc.getElementById("backButton").removeAttribute("disabled");
+    else
+        doc.getElementById("backButton").setAttribute("disabled", "true");
 }
 
 function nextPage(win) {
@@ -135,6 +149,13 @@ function initializePage(win, hash) {
 }
 
 
+function updateButtons(mapEntry, wizardWindow) {
+
+    //setNextEnabled(wizardWindow.document, mapEntry.next ? true : false);
+    setNextText(wizardWindow.document, mapEntry.next ? true : false);
+    setBackEnabled(wizardWindow.document, mapEntry.previous ? true : false);
+}
+
 function saveContents(win, hash) {
 
     var inputs = win.document.getElementsByTagName("FORM")[0].elements;
diff --git a/mozilla/mailnews/base/prefs/resources/content/AccountWizard.xul b/mozilla/mailnews/base/prefs/resources/content/AccountWizard.xul
index 7f21cf3cab0..60c51b99bc9 100644
--- a/mozilla/mailnews/base/prefs/resources/content/AccountWizard.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/AccountWizard.xul
@@ -35,9 +35,6 @@ Rights Reserved.
   <html:iframe flex="100%" style="width: 100%; height:100%; border: none"
                src="chrome://messenger/content/aw-accounttype.xul"
                name="wizardContents" scrolling="auto"/>
-  <html:div>
-    &instructions.label;
-  </html:div>
   <html:br/><html:hr/>
   <box align="horizontal" style="margin: 10px">
 <!--
@@ -45,8 +42,8 @@ Rights Reserved.
     <titledbutton value="Load Page" onclick="onLoadPage(event);"/>
 -->
     <spring flex="100%"/>
-    <titledbutton class="dialog push" value="&lt; &backButton.label;" onclick="onBack(event);"/>
-    <titledbutton class="dialog push" value="&nextButton.label; &gt;" onclick="onNext(event);"/>
+    <titledbutton class="dialog push" id="backButton" value="&lt; &backButton.label;" onclick="onBack(event);"/>
+    <titledbutton class="dialog push" id="nextButton" value="&nextButton.label; &gt;" onclick="onNext(event);"/>
     <spring style="width: 10px"/>
     <titledbutton class="dialog push" value="&cancelButton.label;" onclick="onCancel(event);"/>
   </box>