diff --git a/mozilla/mailnews/base/prefs/resources/content/AccountWizard.js b/mozilla/mailnews/base/prefs/resources/content/AccountWizard.js
index 3be84111718..c4c339ecf66 100644
--- a/mozilla/mailnews/base/prefs/resources/content/AccountWizard.js
+++ b/mozilla/mailnews/base/prefs/resources/content/AccountWizard.js
@@ -854,10 +854,12 @@ function serverIsNntp(pageData) {
   return false;
 }
 
-function getUsernameFromEmail(email)
+function getUsernameFromEmail(aEmail, aEnsureDomain)
 {
-	var emailData = email.split("@");
-    return emailData[0];
+  var username = aEmail.split("@")[0];  
+  if (aEnsureDomain && gCurrentAccountData && gCurrentAccountData.domain)
+    username += '@' + gCurrentAccountData.domain;    
+  return username;
 }
 
 function getCurrentUserName(pageData)
@@ -871,7 +873,7 @@ function getCurrentUserName(pageData)
 	}
 	if (userName == "") {
 		var email = pageData.identity.email.value;
-		userName = getUsernameFromEmail(email); 
+		userName = getUsernameFromEmail(email, false); 
 	}
 	return userName;
 }
@@ -941,16 +943,10 @@ function FixupAccountDataForIsp(accountData)
       return;
 
     var email = accountData.identity.email;
-    var username;
-
-    if (email) {
-      username = getUsernameFromEmail(email);
-    }
-    
+       
     // fix up the username
-    if (!accountData.incomingServer.username) {
-        accountData.incomingServer.username = username;
-    }
+    if (!accountData.incomingServer.username)
+        accountData.incomingServer.username = getUsernameFromEmail(email, accountData.incomingServerUserNameRequiresDomain);
 
     if (!accountData.smtp.username &&
         accountData.smtpRequiresUsername) {
@@ -960,7 +956,7 @@ function FixupAccountDataForIsp(accountData)
       if (accountData.smtp.hostname == accountData.incomingServer.hostName)
         accountData.smtp.username = accountData.incomingServer.username;
       else
-        accountData.smtp.username = username;
+        accountData.smtp.username = getUsernameFromEmail(email, accountData.smtpUserNameRequiresDomain);
     }
 }
 
diff --git a/mozilla/mailnews/base/prefs/resources/content/aw-done.js b/mozilla/mailnews/base/prefs/resources/content/aw-done.js
index 8563b0aadb8..1787e2db668 100644
--- a/mozilla/mailnews/base/prefs/resources/content/aw-done.js
+++ b/mozilla/mailnews/base/prefs/resources/content/aw-done.js
@@ -85,12 +85,14 @@ function donePageInit() {
             email += "@" + currentAccountData.domain;
     }
     setDivTextFromForm("identity.email", email);
-
+    
     var userName="";
     if (pageData.login && pageData.login.username)
         userName = pageData.login.username.value;
     if (!userName && email)
-        userName = getUsernameFromEmail(email);
+        userName = getUsernameFromEmail(email, currentAccountData && 
+                                        currentAccountData.incomingServerUserNameRequiresDomain);
+              
     // Hide the "username" field if we don't want to show information
     // on the incoming server.
     setDivTextFromForm("server.username", hideIncoming ? null : userName);
@@ -99,7 +101,8 @@ function donePageInit() {
     if (pageData.login && pageData.login.smtpusername)
         smtpUserName = pageData.login.smtpusername.value;
     if (!smtpUserName && email)
-        smtpUserName = getUsernameFromEmail(email);
+        smtpUserName = getUsernameFromEmail(email, currentAccountData && 
+                                            currentAccountData.smtpUserNameRequiresDomain);
     setDivTextFromForm("smtpServer.username", smtpUserName);
 
     if (pageData.accname && pageData.accname.prettyName) {
diff --git a/mozilla/mailnews/base/prefs/resources/content/aw-login.js b/mozilla/mailnews/base/prefs/resources/content/aw-login.js
index 276307a6bdd..985fe9cbeb4 100644
--- a/mozilla/mailnews/base/prefs/resources/content/aw-login.js
+++ b/mozilla/mailnews/base/prefs/resources/content/aw-login.js
@@ -79,12 +79,13 @@ function loginPageInit() {
       // retrieve data from previously entered pages
       var type = parent.getCurrentServerType(pageData);
 
-      dump("type = " + type + "\n");
-      protocolinfo = Components.classes["@mozilla.org/messenger/protocol/info;1?type=" + type].getService(Components.interfaces.nsIMsgProtocolInfo);
+      protocolinfo = Components.classes["@mozilla.org/messenger/protocol/info;1?type=" + type]
+                               .getService(Components.interfaces.nsIMsgProtocolInfo);
 
       if (protocolinfo.requiresUsername) {
         // since we require a username, use the uid from the email address
-        loginNameInput.value = parent.getUsernameFromEmail(pageData.identity.email.value);
+        loginNameInput.value = parent.getUsernameFromEmail(pageData.identity.email.value, gCurrentAccountData &&
+                                                           gCurrentAccountData.incomingServerUserNameRequiresDomain);
       }
     }