diff --git a/create-mailbox.php b/create-mailbox.php
index ca9d0f0e..6a2c2030 100644
--- a/create-mailbox.php
+++ b/create-mailbox.php
@@ -46,8 +46,6 @@ else {
 }
 
 
-$pCreate_mailbox_password_text = $PALANG['pCreate_mailbox_password_text'];
-$pCreate_mailbox_quota_text = $PALANG['pCreate_mailbox_quota_text'];
 $pCreate_mailbox_username_text_error = "";
 $pCreate_mailbox_password_text_error = "";
 $pCreate_mailbox_quota_text_error = "";
@@ -264,13 +262,10 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
 
 $smarty->assign ('tUsername', $tUsername);
 $smarty->assign ('select_options', select_options ($list_domains, array ($tDomain)), false);
-$smarty->assign ('pCreate_mailbox_username_text', $pCreate_mailbox_username_text, false);
 $smarty->assign ('pCreate_mailbox_username_text_error', $pCreate_mailbox_username_text_error, false);
-$smarty->assign ('pCreate_mailbox_password_text', $pCreate_mailbox_password_text, false);
 $smarty->assign ('pCreate_mailbox_password_text_error', $pCreate_mailbox_password_text_error, false);
 $smarty->assign ('tName', $tName, false);
 $smarty->assign ('tQuota', $tQuota);
-$smarty->assign ('pCreate_mailbox_quota_text', $pCreate_mailbox_quota_text, false);
 $smarty->assign ('pCreate_mailbox_quota_text_error', $pCreate_mailbox_quota_text_error, false);
 $smarty->assign ('smarty_template', 'create-mailbox');
 $smarty->display ('index.tpl');
diff --git a/templates/create-mailbox.tpl b/templates/create-mailbox.tpl
index 996591c2..88e6cb88 100644
--- a/templates/create-mailbox.tpl
+++ b/templates/create-mailbox.tpl
@@ -10,14 +10,13 @@
 		<td><input class="flat" type="text" name="fUsername" value="{$tUsername}"/></td>
 		<td>@
 		<select name="fDomain">{$select_options}</select>
-		{$pCreate_mailbox_username_text}
 		</td>
 		<td><span class="error_msg">{$pCreate_mailbox_username_text_error}</span></td>
 	</tr>
 	<tr>
 		<td class="label"><label>{$PALANG.pCreate_mailbox_password}:</label></td>
 		<td><input class="flat" type="password" name="fPassword" /></td>
-		<td>{$pCreate_mailbox_password_text}</td>
+		<td>{$PALANG.pCreate_mailbox_password_text}</td>
 		<td><span class="error_msg">{$pCreate_mailbox_password_text_error}</span></td>
 	</tr>
 	<tr>
@@ -35,7 +34,7 @@
 	<tr>
 		<td class="label"><label>{$PALANG.pCreate_mailbox_quota}:</label></td>
 		<td><input class="flat" type="text" name="fQuota" value="{$tQuota}" /></td>
-		<td>{$pCreate_mailbox_quota_text}</td>
+		<td>{$PALANG.pCreate_mailbox_quota_text}</td>
 		<td><span class="error_msg">{$pCreate_mailbox_quota_text_error}</span></td>
 	</tr>
 {/if}
diff --git a/variables.inc.php b/variables.inc.php
index fde777c1..8364dd69 100644
--- a/variables.inc.php
+++ b/variables.inc.php
@@ -76,9 +76,6 @@ $tSubject = "";
 $tUsername = "";
 $tTransport = "";
 
-$pCreate_mailbox_password_text = "&nbsp;";
-$pCreate_mailbox_quota_text = "&nbsp;";
-$pCreate_mailbox_username_text = "&nbsp;";
 $pEdit_mailbox_password_text = "&nbsp;";
 $pEdit_mailbox_quota_text = "&nbsp;";