diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm
index 55737c261a1a3d41f74bba1f1a46563779c78149..9bd676d623d8d0d0e1bfcba233b7bf5a5529abef 100644
--- a/interface/web/mail/templates/mail_user_mailbox_edit.htm
+++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm
@@ -8,7 +8,7 @@
       <div class="ctrlHolder">
         <p class="label"><em>*</em> {tmpl_var name='email_txt'}</p>
         <div class="multiField">
-          <label for="email_local_part" class="blockLabel">Alias<input type="text" id="email_local_part" name="email_local_part" size="20" value="" class="textInput" /></label>
+          <label for="email_local_part" class="blockLabel">Alias<input type="text" id="email_local_part" name="email_local_part" size="20" value="{tmpl_var name='email_local_part'}" class="textInput" /></label>
           <label for="email_at" class="blockLabel email_at">&nbsp;<span id="email_at" name="email_at" />@</label>
           <label for="email_domain" class="blockLabel">Domain<select name="email_domain" id="email_domain" class="selectInput">{tmpl_var name='email_domain'}</select></label>
         </div>
@@ -28,7 +28,9 @@
 			</div>
 			<div class="ctrlHolder">
       	<label for="policy">{tmpl_var name='policy_txt'}</label>
-        <input name="policy" id="policy" value="{tmpl_var name='policy'}" size="30" maxlength="255" type="text" class="textInput" />
+        <select name="policy" id="policy" class="selectInput">
+					{tmpl_var name='policy'}
+				</select>
 			</div>
       <div class="ctrlHolder">
 				<p class="label">{tmpl_var name='postfix_txt'}</p>