diff -ru postfixadmin-2.1.0/admin/create-mailbox.php pa/admin/create-mailbox.php
--- postfixadmin-2.1.0/admin/create-mailbox.php	2005-01-07 08:00:00.000000000 +0900
+++ pa/admin/create-mailbox.php	2006-05-25 14:27:48.000000000 +0900
@@ -61,11 +61,12 @@
    $fUsername = strtolower ($fUsername);
    $fPassword = escape_string ($_POST['fPassword']);
    $fPassword2 = escape_string ($_POST['fPassword2']);
-   isset ($_POST['fName']) ? $fName = escape_string ($_POST['fName']) : $fName = "No Name";
+   #isset ($_POST['fName']) ? $fName = escape_string ($_POST['fName']) : $fName = "No Name";
    $fDomain = escape_string ($_POST['fDomain']);
    isset ($_POST['fQuota']) ? $fQuota = escape_string ($_POST['fQuota']) : $fQuota = "0";
    isset ($_POST['fActive']) ? $fActive = escape_string ($_POST['fActive']) : $fActive = "1";
    if (isset ($_POST['fMail'])) $fMail = escape_string ($_POST['fMail']);
+   $fName = ($fDomain == $CONF['default_domain']) ? escape_string ($_POST['fUsername']) : $fUsername;
 
    if (!check_mailbox ($fDomain))
    {
diff -ru postfixadmin-2.1.0/admin/edit-mailbox.php pa/admin/edit-mailbox.php
--- postfixadmin-2.1.0/admin/edit-mailbox.php	2005-01-07 08:00:00.000000000 +0900
+++ pa/admin/edit-mailbox.php	2006-05-25 14:36:44.000000000 +0900
@@ -65,7 +65,7 @@
    
    $fPassword = escape_string ($_POST['fPassword']);
    $fPassword2 = escape_string ($_POST['fPassword2']);
-   $fName = escape_string ($_POST['fName']);
+   #$fName = escape_string ($_POST['fName']);
    if (isset ($_POST['fQuota'])) $fQuota = escape_string ($_POST['fQuota']);
    if (isset ($_POST['fActive'])) $fActive = escape_string ($_POST['fActive']);
   
@@ -112,12 +112,12 @@
       
       if (empty ($fPassword) and empty ($fPassword2))
       {
-         $result = db_query ("UPDATE mailbox SET name='$fName',quota='$quota',modified=NOW(),active='$fActive' WHERE username='$fUsername' AND domain='$fDomain'");
+         $result = db_query ("UPDATE mailbox SET quota='$quota',modified=NOW(),active='$fActive' WHERE username='$fUsername' AND domain='$fDomain'");
       }
       else
       {
          $password = pacrypt ($fPassword);
-         $result = db_query ("UPDATE mailbox SET password='$password',name='$fName',quota='$quota',modified=NOW(),active='$fActive' WHERE username='$fUsername' AND domain='$fDomain'");
+         $result = db_query ("UPDATE mailbox SET password='$password',quota='$quota',modified=NOW(),active='$fActive' WHERE username='$fUsername' AND domain='$fDomain'");
       }
 
       if ($result['rows'] != 1)
diff -ru postfixadmin-2.1.0/create-mailbox.php pa/create-mailbox.php
--- postfixadmin-2.1.0/create-mailbox.php	2005-01-07 08:00:00.000000000 +0900
+++ pa/create-mailbox.php	2006-05-25 14:38:29.000000000 +0900
@@ -62,11 +62,12 @@
    $fUsername = strtolower ($fUsername);
    $fPassword = escape_string ($_POST['fPassword']);
    $fPassword2 = escape_string ($_POST['fPassword2']);
-   $fName = escape_string ($_POST['fName']);
+   #$fName = escape_string ($_POST['fName']);
    $fDomain = escape_string ($_POST['fDomain']);
    if (isset ($_POST['fQuota'])) $fQuota = escape_string ($_POST['fQuota']);
    if (isset ($_POST['fActive'])) $fActive = escape_string ($_POST['fActive']);
    if (isset ($_POST['fMail'])) $fMail = escape_string ($_POST['fMail']);
+   $fName = ($fDomain == $CONF['default_domain']) ? escape_string ($_POST['fUsername']) : $fUsername;
 
    if (!check_owner ($SESSID_USERNAME, $fDomain))
    {
diff -ru postfixadmin-2.1.0/edit-mailbox.php pa/edit-mailbox.php
--- postfixadmin-2.1.0/edit-mailbox.php	2005-01-07 08:00:00.000000000 +0900
+++ pa/edit-mailbox.php	2006-05-25 14:37:42.000000000 +0900
@@ -70,7 +70,7 @@
    
    $fPassword = escape_string ($_POST['fPassword']);
    $fPassword2 = escape_string ($_POST['fPassword2']);
-   $fName = escape_string ($_POST['fName']);
+   #$fName = escape_string ($_POST['fName']);
    if (isset ($_POST['fQuota'])) $fQuota = escape_string ($_POST['fQuota']);
    if (isset ($_POST['fActive'])) $fActive = escape_string ($_POST['fActive']);
   
@@ -126,12 +126,14 @@
       
       if (empty ($fPassword) and empty ($fPassword2))
       {
-         $result = db_query ("UPDATE mailbox SET name='$fName',quota='$quota',modified=NOW(),active='$fActive' WHERE username='$fUsername' AND domain='$fDomain'");
+         #$result = db_query ("UPDATE mailbox SET name='$fName',quota='$quota',modified=NOW(),active='$fActive' WHERE username='$fUsername' AND domain='$fDomain'");
+         $result = db_query ("UPDATE mailbox SET quota='$quota',modified=NOW(),active='$fActive' WHERE username='$fUsername' AND domain='$fDomain'");
       }
       else
       {
          $password = pacrypt ($fPassword);
-         $result = db_query ("UPDATE mailbox SET password='$password',name='$fName',quota='$quota',modified=NOW(),active='$fActive' WHERE username='$fUsername' AND domain='$fDomain'");
+         #$result = db_query ("UPDATE mailbox SET password='$password',name='$fName',quota='$quota',modified=NOW(),active='$fActive' WHERE username='$fUsername' AND domain='$fDomain'");
+         $result = db_query ("UPDATE mailbox SET password='$password',quota='$quota',modified=NOW(),active='$fActive' WHERE username='$fUsername' AND domain='$fDomain'");
       }
 
       if ($result['rows'] != 1)
diff -ru postfixadmin-2.1.0/users/login.php pa/users/login.php
--- postfixadmin-2.1.0/users/login.php	2005-01-07 08:00:00.000000000 +0900
+++ pa/users/login.php	2006-05-25 14:14:17.000000000 +0900
@@ -46,14 +46,16 @@
       if ($result['rows'] != 1)
       {
          $error = 1;
-         $tMessage = $PALANG['pLogin_password_incorrect'];
+         #$tMessage = $PALANG['pLogin_password_incorrect'];
+         $tMessage = $PALANG['pUsersLogin_username_incorrect'];
          $tUsername = $fUsername;
       }
    }
    else
    {
       $error = 1;
-      $tMessage = $PALANG['pLogin_username_incorrect'];
+      #$tMessage = $PALANG['pLogin_username_incorrect'];
+      $tMessage = $PALANG['pUsersLogin_username_incorrect'];
    }
 
    if ($error != 1)