diff --git a/edit-mailbox.php b/edit-mailbox.php
index 647bdb7c..274168e8 100644
--- a/edit-mailbox.php
+++ b/edit-mailbox.php
@@ -46,6 +46,7 @@ $fUsername = strtolower ($fUsername);
 if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
 
 $pEdit_mailbox_quota_text_error = "";
+$mailbox_password_text_error = "";
 
 if (!(check_owner ($SESSID_USERNAME, $fDomain) || authentication_has_role('global-admin')) )
 {
diff --git a/templates/edit-mailbox.tpl b/templates/edit-mailbox.tpl
index 15e8b519..2f7b21b6 100644
--- a/templates/edit-mailbox.tpl
+++ b/templates/edit-mailbox.tpl
@@ -7,7 +7,7 @@
 	<tr>
 		<td class="label"><label>{$PALANG.pEdit_mailbox_username}:</label></td>
 		<td><em>{$fUsername}</em></td>
-		<td>{$pEdit_mailbox_username_text}</td>
+		<td>&nbsp;</td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>