diff --git a/mailnews/base/prefs/resources/content/aw-done.xul b/mailnews/base/prefs/resources/content/aw-done.xul
index 27e5c9015f24..342382c7db65 100644
--- a/mailnews/base/prefs/resources/content/aw-done.xul
+++ b/mailnews/base/prefs/resources/content/aw-done.xul
@@ -26,6 +26,6 @@ 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"
-    onload="parent.currentPageTag='done'">
+    onload="parent.wizardPageLoaded('done');">
 <html:div>That's it!</html:div>
 </window>
diff --git a/mailnews/base/prefs/resources/content/aw-identity.xul b/mailnews/base/prefs/resources/content/aw-identity.xul
index 798d331bcdce..425c70484c6e 100644
--- a/mailnews/base/prefs/resources/content/aw-identity.xul
+++ b/mailnews/base/prefs/resources/content/aw-identity.xul
@@ -26,7 +26,7 @@ Rights Reserved.
 
 <window id="identity" xmlns:html="http://www.w3.org/TR/REC-html40"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    onload="parent.currentPageTag='identity'">
+    onload="parent.wizardPageLoaded('identity');">
 
 <box align="vertical" style="width: 100%; height: 100%; margin: 10px">
   <html:div>Please enter your name and email address.</html:div>
diff --git a/mailnews/base/prefs/resources/content/aw-intro.xul b/mailnews/base/prefs/resources/content/aw-intro.xul
index b0811fe0382f..2227382ac770 100644
--- a/mailnews/base/prefs/resources/content/aw-intro.xul
+++ b/mailnews/base/prefs/resources/content/aw-intro.xul
@@ -26,6 +26,6 @@ Rights Reserved.
 
 <window id="intro" title="intro" xmlns:html="http://www.w3.org/TR/REC-html40"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    onload="parent.currentPageTag='intro'">
+    onload="parent.wizardPageLoaded('intro');">
 <html:div>Welcome to the account wizard</html:div>
 </window>
diff --git a/mailnews/base/prefs/resources/content/aw-server.xul b/mailnews/base/prefs/resources/content/aw-server.xul
index daff12951054..50a5a8cba837 100644
--- a/mailnews/base/prefs/resources/content/aw-server.xul
+++ b/mailnews/base/prefs/resources/content/aw-server.xul
@@ -26,7 +26,7 @@ Rights Reserved.
 
 <window id="server" xmlns:html="http://www.w3.org/TR/REC-html40"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    onload="parent.currentPageTag='server'">
+    onload="parent.wizardPageLoaded('server');">
 
 <box align="vertical" style="width: 100%; height: 100%; margin: 10px">
   <html:div>Mail Server user name:</html:div>
@@ -41,5 +41,22 @@ Rights Reserved.
     <html:div>(e.g. jsmith)</html:div>
   </box>
 
+  <html:div>Mail Server Type:</html:div>
+  <box align="vertical">
+    <html:div>
+      <html:input type="radio" name="servertype" id="pop3radio" value="pop3"/>
+      POP3
+      <html:br/>
+    </html:div>
+    <html:div>
+      <html:input type="radio" name="servertype" id="imapradio" value="imap"/>
+      IMAP
+      <html:br/>
+    </html:div>
+    <html:div>
+      <html:input type="radio" name="servertype" id="nntpradio" value="nntp"/>
+      News (NNTP)
+    </html:div>
+  </box>
 </box>
 </window>
diff --git a/mailnews/base/prefs/resources/content/aw-smtp.xul b/mailnews/base/prefs/resources/content/aw-smtp.xul
index 87e4f0f6564c..e47bc1967659 100644
--- a/mailnews/base/prefs/resources/content/aw-smtp.xul
+++ b/mailnews/base/prefs/resources/content/aw-smtp.xul
@@ -26,14 +26,12 @@ Rights Reserved.
 
 <window id="smtp" xmlns:html="http://www.w3.org/TR/REC-html40"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    onload="parent.currentPageTag='smtp'">
+    onload="parent.wizardPageLoaded('smtp');">
 
 <box align="vertical" style="width: 100%; height: 100%; margin: 10px">
   <html:div>Outgoing mail (SMTP) server:</html:div>
   <box align="horizontal">
-    <html:input id="smtp" type="text"/>
-    <html:div>f!</html:div>
+    <html:input id="smtpserver" type="text"/>
   </box>
-
 </box>
 </window>