diff --git a/admin/templates/default/account_form.tpl b/admin/templates/default/account_form.tpl
index 243b2b5174..8d5711a305 100644
--- a/admin/templates/default/account_form.tpl
+++ b/admin/templates/default/account_form.tpl
@@ -39,7 +39,7 @@
 			
 			    <tr bgcolor="{tr_color1}">
 			     <td>{lang_expires}</td>
-			     <td colspan=3>{input_expires}&nbsp;</td>
+			     <td colspan="3">{input_expires}&nbsp;&nbsp;{lang_never}&nbsp;<input type="checkbox" name="never_expires" value="True"{never_expires}></td>
 			    </tr>
 			
 			    {permissions_list}
diff --git a/admin/templates/default/account_form_ldap.tpl b/admin/templates/default/account_form_ldap.tpl
index 132e5a5c5e..aaf272cfc2 100644
--- a/admin/templates/default/account_form_ldap.tpl
+++ b/admin/templates/default/account_form_ldap.tpl
@@ -46,7 +46,7 @@
 			
 			    <tr bgcolor="{tr_color1}">
 			     <td>{lang_expires}</td>
-			     <td colspan=3>{input_expires}&nbsp;</td>
+			     <td colspan="3">{input_expires}&nbsp;&nbsp;{lang_never}&nbsp;<input type="checkbox" name="never_expires" value="True"{never_expires}></td>
 			    </tr>
 			
 			    {permissions_list}