diff --git a/mailnews/base/prefs/resources/content/AccountWizard.js b/mailnews/base/prefs/resources/content/AccountWizard.js
index fcf9aca9c647..ac19b07f4855 100644
--- a/mailnews/base/prefs/resources/content/AccountWizard.js
+++ b/mailnews/base/prefs/resources/content/AccountWizard.js
@@ -125,6 +125,8 @@ function initializePage(win, hash) {
     for (var i=0; i<inputs.length; i++) {
         restoreValue(hash, inputs[i]);
     }
+
+    if (win.onInit) win.onInit();
 }
 
 
diff --git a/mailnews/base/prefs/resources/content/aw-accname.xul b/mailnews/base/prefs/resources/content/aw-accname.xul
index 18d85dd7d2ed..441c9c753592 100644
--- a/mailnews/base/prefs/resources/content/aw-accname.xul
+++ b/mailnews/base/prefs/resources/content/aw-accname.xul
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/wizard.css" type="text/css"?>
 
 <!--
 The contents of this file are subject to the Netscape Public
diff --git a/mailnews/base/prefs/resources/content/aw-done.xul b/mailnews/base/prefs/resources/content/aw-done.xul
index 38037828bc13..754e66a4290c 100644
--- a/mailnews/base/prefs/resources/content/aw-done.xul
+++ b/mailnews/base/prefs/resources/content/aw-done.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
-
+<?xml-stylesheet href="chrome://messenger/skin/wizard.css" type="text/css"?>
 <!--
 The contents of this file are subject to the Netscape Public
 License Version 1.1 (the "License"); you may not use this file
@@ -26,6 +26,27 @@ Rights Reserved.
 
 <window id="done" xmlns:html="http://www.w3.org/TR/REC-html40"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    align="vertical"
     onload="parent.wizardPageLoaded('done');">
+  <html:script src="aw-done.js"/>
+  <box class="title" align="horizontal">
+    <html:div class="title">&completionTitle.label;</html:div>
+    <spring flex="100%"/>
+    <titledbutton class="plain" src="chrome://navigator/skin/animthrob_single.gif"/>
+  </box>
+
+<html:input type="hidden" name="server.username" id="server.username"/>
+<html:input type="hidden" name="identity.email" id="identity.email"/>
 <html:div>&completionText.label;</html:div>
+<html:p/>
+<box align="horizontal">
+  <html:div>&userNamePrefix.label;</html:div>
+  <html:div id="server.username.text"/>
+</box>
+<box align="horizontal">
+  <html:div>&emailPrefix.label;</html:div>
+  <html:div id="identity.email.text"/>
+</box>
+<html:p/>
+<html:div>&setupAnother.label;</html:div>
 </window>
diff --git a/mailnews/base/prefs/resources/content/aw-login.xul b/mailnews/base/prefs/resources/content/aw-login.xul
index efbd655676b9..bc2e513dffea 100644
--- a/mailnews/base/prefs/resources/content/aw-login.xul
+++ b/mailnews/base/prefs/resources/content/aw-login.xul
@@ -28,6 +28,7 @@ Rights Reserved.
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     align="vertical"
     onload="parent.wizardPageLoaded('login');">
+
   <box class="title" align="horizontal">
     <html:div class="title">&loginTitle.label;</html:div>
     <spring flex="100%"/>
@@ -55,7 +56,7 @@ Rights Reserved.
       <html:div>&passwordDesc.label;</html:div>
       <html:div>
         &passwordLabel.label;
-        <html:input type="password" name="password" id="password"/>
+        <html:input type="password" name="server.password" id="server.password"/>
       </html:div>
     </html:div>
   </box>
diff --git a/mailnews/base/prefs/resources/content/aw-server.xul b/mailnews/base/prefs/resources/content/aw-server.xul
index 47b7bc1631be..5afe3f45f47b 100644
--- a/mailnews/base/prefs/resources/content/aw-server.xul
+++ b/mailnews/base/prefs/resources/content/aw-server.xul
@@ -26,9 +26,9 @@ Rights Reserved.
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-server.dtd" >
 <window id="serverpage" xmlns:html="http://www.w3.org/TR/REC-html40"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    align="vertical"
     onload="parent.wizardPageLoaded('server');">
 
-<box align="vertical" style="width: 100%; height: 100%; margin: 10px">
   <box class="title" align="horizontal">
     <html:div class="title">&serverTitle.label;</html:div>
     <spring flex="100%"/>
@@ -62,5 +62,4 @@ Rights Reserved.
       <html:input type="text" id="smtp.hostname" name="smtp.hostname"/>
     </html:div>
   </box>
-</box>
 </window>