diff --git a/vexim/adminaliasadd.php b/vexim/adminaliasadd.php
index 6a482d90..0003903e 100644
--- a/vexim/adminaliasadd.php
+++ b/vexim/adminaliasadd.php
@@ -28,6 +28,11 @@
             <td><?php echo _('Alias Name'); ?>:</td>
             <td><input name="realname" type="text" class="textfield"></td>
           </tr>
+          <tr>
+            <td><?php echo _('User Name'); ?>:</td>
+            <td>
+              <input name="username" type="text" class="textfield"></td>
+          </tr>
           <tr>
             <td><?php echo _('Address'); ?>:</td>
             <td>
diff --git a/vexim/adminaliasaddsubmit.php b/vexim/adminaliasaddsubmit.php
index 9b3984ad..2d456623 100644
--- a/vexim/adminaliasaddsubmit.php
+++ b/vexim/adminaliasaddsubmit.php
@@ -45,7 +45,7 @@
 
   # check_user_exists() will die if a user account already exists with the same localpart and domain id
   check_user_exists(
-    $dbh,$_POST['localpart'],$_SESSION['domain_id'],'adminalias.php'
+    $dbh,$_POST['username'],$_POST['localpart'],$_SESSION['domain_id'],'adminalias.php'
   );
 
   if ((preg_match("/['@%!\/\|\" ']/",$_POST['localpart']))
@@ -73,7 +73,7 @@
     $sth = $dbh->prepare($query);
        $success = $sth->execute(array(
        ':localpart' => $_POST['localpart'],
-       ':username' => $_POST['localpart'] . '@' . $_SESSION['domain'],
+       ':username' => $_POST['username'],
        ':domain_id' => $_SESSION['domain_id'],
        ':crypt' => crypt_password($_POST['clear']),
        ':smtp' => $aliasto,
diff --git a/vexim/adminaliaschange.php b/vexim/adminaliaschange.php
index 6e31b530..449a4dec 100644
--- a/vexim/adminaliaschange.php
+++ b/vexim/adminaliaschange.php
@@ -3,7 +3,7 @@
   include_once dirname(__FILE__) . '/config/authpostmaster.php';
   include_once dirname(__FILE__) . '/config/functions.php';
   include_once dirname(__FILE__) . '/config/httpheaders.php';
-  $query = "SELECT localpart,realname,smtp,on_avscan,on_spamassassin,sa_tag,sa_refuse,spam_drop,
+  $query = "SELECT localpart,username,realname,smtp,on_avscan,on_spamassassin,sa_tag,sa_refuse,spam_drop,
     admin,enabled FROM users 	
 	WHERE user_id=:user_id AND domain_id=:domain_id AND type='alias'";
   $sth = $dbh->prepare($query);
@@ -52,6 +52,13 @@
               value="<?php print $row['realname']; ?>"class="textfield">
             </td>
           </tr>
+          <tr>
+            <td><?php echo _('User Name'); ?>:</td>
+            <td>
+              <input name="username" type="text"
+              value="<?php print $row['username']; ?>"class="textfield">
+            </td>
+          </tr>
           <tr>
             <td><?php echo _('Address'); ?>:</td>
             <td>
diff --git a/vexim/adminfailaddsubmit.php b/vexim/adminfailaddsubmit.php
index 2695a41d..3f3cb206 100644
--- a/vexim/adminfailaddsubmit.php
+++ b/vexim/adminfailaddsubmit.php
@@ -5,7 +5,7 @@
   include_once dirname(__FILE__) . '/config/httpheaders.php';
 
   check_user_exists(
-    $dbh,$_POST['localpart'],$_SESSION['domain_id'],'adminfail.php'
+    $dbh,$_POST['localpart'].'@'.$_SESSION['domain'],$_POST['localpart'],$_SESSION['domain_id'],'adminfail.php'
   );
 
   if (preg_match("/['@%!\/\| ']/",$_POST['localpart'])) {
diff --git a/vexim/admingroupaddsubmit.php b/vexim/admingroupaddsubmit.php
index e6dc1e1c..402fea3c 100644
--- a/vexim/admingroupaddsubmit.php
+++ b/vexim/admingroupaddsubmit.php
@@ -9,7 +9,7 @@
   }
 
   check_user_exists(
-    $dbh,$_POST['localpart'],$_SESSION['domain_id'],'admingroup.php'
+    $dbh,$_POST['localpart'].'@'.$_SESSION['domain'],$_POST['localpart'],$_SESSION['domain_id'],'admingroup.php'
   );
 
   $query = "INSERT INTO groups (name, domain_id)
diff --git a/vexim/adminuser.php b/vexim/adminuser.php
index 207db1b4..04f766ce 100644
--- a/vexim/adminuser.php
+++ b/vexim/adminuser.php
@@ -12,7 +12,7 @@
   if (!isset($_POST['searchfor'])) {
     $_POST['searchfor'] = '';
   }
-  if (!isset($_POST['field']) || ($_POST['field'] != 'localpart')) {
+  if (!isset($_POST['field']) || (($_POST['field'] != 'localpart') && ($_POST['field'] != 'username'))) {
     $_POST['field'] = 'realname';
   }
 ?>
@@ -57,6 +57,9 @@
           <option value="realname" <?php if ($_POST['field'] == 'realname') {
             echo 'selected="selected"';
           } ?>><?php echo _('User'); ?></option>
+          <option value="username" <?php if ($_POST['field'] == 'username') {
+            echo "selected=\"selected\"";
+          } ?>><?php echo _('User Name'); ?></option>
           <option value="localpart" <?php if ($_POST['field'] == 'localpart') {
             echo "selected=\"selected\"";
           } ?>><?php echo _('Email address'); ?></option>
diff --git a/vexim/adminuseradd.php b/vexim/adminuseradd.php
index 8463c598..9233f2da 100644
--- a/vexim/adminuseradd.php
+++ b/vexim/adminuseradd.php
@@ -48,6 +48,12 @@
             <input type="textfield" size="25" name="realname" class="textfield">
           </td>
         </tr>
+        <tr>
+          <td><?php echo _('User Name'); ?>:</td>
+          <td colspan="2">
+            <input type="textfield" size="25" name="username" class="textfield">
+          </td>
+        </tr>
         <tr>
           <td><?php echo _('Address'); ?>:</td>
           <td colspan="2">
diff --git a/vexim/adminuseraddsubmit.php b/vexim/adminuseraddsubmit.php
index fb5b62df..ecb5b8c0 100644
--- a/vexim/adminuseraddsubmit.php
+++ b/vexim/adminuseraddsubmit.php
@@ -24,6 +24,8 @@
   # Strip off leading and trailing spaces
   $_POST['localpart'] = preg_replace("/^\s+/","",$_POST['localpart']);
   $_POST['localpart'] = preg_replace("/\s+$/","",$_POST['localpart']); 
+  $_POST['username'] = preg_replace("/^\s+/","",$_POST['username']);
+  $_POST['username'] = preg_replace("/\s+$/","",$_POST['username']); 
 
   # get the settings for the domain 
   $query = "SELECT avscan,spamassassin,pipe,uid,gid,quotas,maxmsgsize FROM domains 
@@ -90,7 +92,7 @@
   }
 
   check_user_exists(
-    $dbh,$_POST['localpart'],$_SESSION['domain_id'],'adminuser.php'
+    $dbh,$_POST["username"],$_POST['localpart'],$_SESSION['domain_id'],'adminuser.php'
   );
 
   if (preg_match("/^\s*$/",$_POST['realname'])) {
@@ -128,7 +130,7 @@
     $sth = $dbh->prepare($query);
     $success = $sth->execute(array(':localpart'=>$_POST['localpart'],
         ':localpart'=>$_POST['localpart'],
-        ':username'=>$_POST['localpart'].'@'.$_SESSION['domain'],
+        ':username'=>$_POST['username'],
         ':domain_id'=>$_SESSION['domain_id'],
         ':crypt'=>crypt_password($_POST['clear']),
         ':smtp'=>$smtphomepath,
diff --git a/vexim/adminuserchange.php b/vexim/adminuserchange.php
index 9f752149..94808082 100644
--- a/vexim/adminuserchange.php
+++ b/vexim/adminuserchange.php
@@ -58,6 +58,10 @@
         </tr>
         <tr>
           <td><?php echo _('Email Address'); ?>:</td>
+          <td><?php print $row['localpart'] . '@' . $_SESSION['domain']; ?></td>
+        </tr>
+        <tr>
+          <td><?php echo _('User Name'); ?>:</td>
           <td><?php print $row['username']; ?></td>
         </tr>
         <input name="user_id" type="hidden"
diff --git a/vexim/config/functions.php b/vexim/config/functions.php
index 8beeb187..539827a7 100644
--- a/vexim/config/functions.php
+++ b/vexim/config/functions.php
@@ -27,14 +27,17 @@ function validate_password($password, $confirmationPassword)
      * @param  string  $domain_id
      * @param  string  $page       page to return to
      */
-    function check_user_exists($dbh,$localpart,$domain_id,$page)
+    function check_user_exists($dbh,$username,$localpart,$domain_id,$page)
     {
         $query = "SELECT COUNT(*) AS c 
                   FROM   users 
-                  WHERE  localpart=:localpart
-                  AND    domain_id=:domain_id";
+                  WHERE  username=:username
+                  OR (
+                      localpart=:localpart
+                      AND    domain_id=:domain_id
+                  )";
         $sth = $dbh->prepare($query);
-        $sth->execute(array(':localpart'=>$localpart, ':domain_id'=>$domain_id));
+        $sth->execute(array(':username'=>$username, ':localpart'=>$localpart, ':domain_id'=>$domain_id));
         $row = $sth->fetch();
         if ($row['c'] != 0) 
         {
diff --git a/vexim/siteadd.php b/vexim/siteadd.php
index 07bad095..de605599 100644
--- a/vexim/siteadd.php
+++ b/vexim/siteadd.php
@@ -31,9 +31,9 @@
             if ($_GET['type'] == "local") {
           ?>
           <tr>
-            <td><?php echo _('Domain Admin'); ?>:</td>
+            <td><?php echo _('User Name'); ?>:</td>
             <td>
-              <input name="localpart" type="text" value="postmaster"
+              <input name="username" type="text" value=""
                 class="textfield">
             </td>
             <td>
@@ -42,6 +42,15 @@ class="textfield">
               ?>
             </td>
           </tr>
+          <tr>
+            <td><?php echo _('Domain Admin'); ?>:</td>
+            <td>
+              <input name="localpart" type="text" value="postmaster"
+                class="textfield">
+            </td>
+            <td>
+            </td>
+          </tr>
           <tr>
             <td><?php echo _('Password'); ?>:</td>
             <td colspan="2">
diff --git a/vexim/siteaddsubmit.php b/vexim/siteaddsubmit.php
index 3472db05..3e501228 100644
--- a/vexim/siteaddsubmit.php
+++ b/vexim/siteaddsubmit.php
@@ -109,7 +109,7 @@
             WHERE domains.domain=:domain";
         $sth = $dbh->prepare($query);
         $success = $sth->execute(array(':localpart'=>$_POST['localpart'],
-                ':username'=>$_POST['localpart'].'@'.$_POST['domain'],
+                ':username'=>$_POST['username'],
                 ':crypt'=>crypt_password($_POST['clear']),
                 ':uid'=>$uid, ':gid'=>$gid, ':smtp'=>$smtphomepath,
                 ':pop'=>$pophomepath,
diff --git a/vexim/userchange.php b/vexim/userchange.php
index 9e68f81a..13ab5dde 100644
--- a/vexim/userchange.php
+++ b/vexim/userchange.php
@@ -32,6 +32,7 @@
       <form name="userchange" method="post" action="userchangesubmit.php">
 	<table align="center">
 	  <tr><td><?php echo _("Name"); ?>:</td><td><input name="realname" type="text" value="<?php print $row['realname']; ?>" class="textfield"></td></tr>
+	  <tr><td><?php echo _("User Name"); ?>:</td><td><?php print $row['username']; ?></tr>
 	  <tr><td><?php echo _("Email Address"); ?>:</td><td><?php print $row['localpart']."@".$_SESSION['domain']; ?></td>
 	  <tr><td><?php echo _("Password"); ?>:</td><td><input name="clear" type="password" class="textfield"></td></tr>
 	  <tr><td><?php echo _("Verify Password"); ?>:</td><td><input name="vclear" type="password" class="textfield"></td></tr>