diff --git a/include/staff/email.inc.php b/include/staff/email.inc.php
index e16b350bdbd3a58f64862da9de74b4c835e9dc23..5e2935e06a02157c4cc7f62e45a38eb4af87326d 100644
--- a/include/staff/email.inc.php
+++ b/include/staff/email.inc.php
@@ -77,7 +77,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                 Login Password
             </td>
             <td>
-                <input type="text" size="35" name="passwd" value="<?php echo $info['passwd']; ?>">
+                <input type="password" size="35" name="passwd" value="<?php echo $info['passwd']; ?>">
                 &nbsp;<span class="error">&nbsp;<?php echo $errors['passwd']; ?>&nbsp;</span>
                 <br><em><?php echo $passwdtxt; ?></em>
             </td>
@@ -118,10 +118,10 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
 
         <tr><td>Encryption</td>
             <td>
-                 <label><input type="radio" name="mail_encryption"  value="NONE"
-                    <?php echo ($info['mail_encryption']!='SSL')?'checked="checked"':''; ?> />None</label>
-                 <label><input type="radio" name="mail_encryption"  value="SSL"
-                    <?php echo ($info['mail_encryption']=='SSL')?'checked="checked"':''; ?> />SSL</label>
+                <select name="mail_encryption">
+                    <option value='NONE'>None</option>
+                    <option value='SSL' <?php echo ($info['mail_encryption']=='SSL')?'selected="selected"':''; ?> >SSL</option>
+                </select>
                 <font class="error">&nbsp;<?php echo $errors['mail_encryption']; ?></font>
             </td>
         </tr>