diff --git a/interface/web/client/form/client_template.tform.php b/interface/web/client/form/client_template.tform.php
index e1dd51dcd37fef8694f3178f59b42f16464e40e5..5f34c58ffef746302703e24fee8186dadbd931ba 100644
--- a/interface/web/client/form/client_template.tform.php
+++ b/interface/web/client/form/client_template.tform.php
@@ -367,6 +367,7 @@ $form["tabs"]['limits'] = array (
 			'rows'		=> '',
 			'cols'		=> ''
 		),
+		/*
 		'limit_client' => array (
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'TEXT',
@@ -381,6 +382,7 @@ $form["tabs"]['limits'] = array (
 			'rows'		=> '',
 			'cols'		=> ''
 		),
+		*/
 		'limit_database' => array (
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'TEXT',
diff --git a/interface/web/client/templates/client_template_edit_limits.htm b/interface/web/client/templates/client_template_edit_limits.htm
index 2a4374cbfb2df4da1b53547b6f864c7b33ac1f30..1ee1a1e487420cdb0149a33906e81ae952569bf4 100644
--- a/interface/web/client/templates/client_template_edit_limits.htm
+++ b/interface/web/client/templates/client_template_edit_limits.htm
@@ -1,116 +1,112 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_client_template">
-
-  <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Limits</legend>
-      <div class="ctrlHolder">
-      	<label for="limit_maildomain">{tmpl_var name='limit_maildomain_txt'}</label>
-        <input name="limit_maildomain" id="limit_maildomain" value="{tmpl_var name='limit_maildomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_mailbox">{tmpl_var name='limit_mailbox_txt'}</label>
-        <input name="limit_mailbox" id="limit_mailbox" value="{tmpl_var name='limit_mailbox'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_mailalias">{tmpl_var name='limit_mailalias_txt'}</label>
-        <input name="limit_mailalias" id="limit_mailalias" value="{tmpl_var name='limit_mailalias'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_mailforward">{tmpl_var name='limit_mailforward_txt'}</label>
-        <input name="limit_mailforward" id="limit_mailforward" value="{tmpl_var name='limit_mailforward'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_mailcatchall">{tmpl_var name='limit_mailcatchall_txt'}</label>
-        <input name="limit_mailcatchall" id="limit_mailcatchall" value="{tmpl_var name='limit_mailcatchall'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_mailrouting">{tmpl_var name='limit_mailrouting_txt'}</label>
-        <input name="limit_mailrouting" id="limit_mailrouting" value="{tmpl_var name='limit_mailrouting'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_mailfilter">{tmpl_var name='limit_mailfilter_txt'}</label>
-        <input name="limit_mailfilter" id="limit_mailfilter" value="{tmpl_var name='limit_mailfilter'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_fetchmail">{tmpl_var name='limit_fetchmail_txt'}</label>
-        <input name="limit_fetchmail" id="limit_fetchmail" value="{tmpl_var name='limit_fetchmail'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_mailquota">{tmpl_var name='limit_mailquota_txt'}</label>
-        <input name="limit_mailquota" id="limit_mailquota" value="{tmpl_var name='limit_mailquota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_spamfilter_wblist">{tmpl_var name='limit_spamfilter_wblist_txt'}</label>
-        <input name="limit_spamfilter_wblist" id="limit_spamfilter_wblist" value="{tmpl_var name='limit_spamfilter_wblist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_spamfilter_user">{tmpl_var name='limit_spamfilter_user_txt'}</label>
-        <input name="limit_spamfilter_user" id="limit_spamfilter_user" value="{tmpl_var name='limit_spamfilter_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_spamfilter_policy">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
-        <input name="limit_spamfilter_policy" id="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_web_domain">{tmpl_var name='limit_web_domain_txt'}</label>
-        <input name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_web_aliasdomain">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
-        <input name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_web_subdomain">{tmpl_var name='limit_web_subdomain_txt'}</label>
-        <input name="limit_web_subdomain" id="limit_web_subdomain" value="{tmpl_var name='limit_web_subdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_ftp_user">{tmpl_var name='limit_ftp_user_txt'}</label>
-        <input name="limit_ftp_user" id="limit_ftp_user" value="{tmpl_var name='limit_ftp_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_shell_user">{tmpl_var name='limit_shell_user_txt'}</label>
-        <input name="limit_shell_user" id="limit_shell_user" value="{tmpl_var name='limit_shell_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_dns_zone">{tmpl_var name='limit_dns_zone_txt'}</label>
-        <input name="limit_dns_zone" id="limit_dns_zone" value="{tmpl_var name='limit_dns_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_dns_record">{tmpl_var name='limit_dns_record_txt'}</label>
-        <input name="limit_dns_record" id="limit_dns_record" value="{tmpl_var name='limit_dns_record'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_client">{tmpl_var name='limit_client_txt'}</label>
-        <input name="limit_client" id="limit_client" value="{tmpl_var name='limit_client'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_database">{tmpl_var name='limit_database_txt'}</label>
-        <input name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-        <label for="limit_cron">{tmpl_var name='limit_cron_txt'}</label>
-        <input name="limit_cron" id="limit_cron" value="{tmpl_var name='limit_cron'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-            </div>
-      <div class="ctrlHolder">
-        <label for="limit_cron_type">{tmpl_var name='limit_cron_type_txt'}</label>
-        <select name="limit_cron_type" id="limit_cron_type" class="selectInput formLengthHalf">
-          {tmpl_var name='limit_cron_type'}
-        </select>
-            </div>
-      <div class="ctrlHolder">
-        <label for="limit_cron_frequency">{tmpl_var name='limit_cron_frequency_txt'}</label>
-        <input name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-            </div>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
-    <div class="buttonHolder buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/client_template_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_template_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_client_template">
+
+  <div class="pnl_formsarea">
+    <fieldset class="inlineLabels"><legend>Limits</legend>
+      <div class="ctrlHolder">
+      	<label for="limit_maildomain">{tmpl_var name='limit_maildomain_txt'}</label>
+        <input name="limit_maildomain" id="limit_maildomain" value="{tmpl_var name='limit_maildomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_mailbox">{tmpl_var name='limit_mailbox_txt'}</label>
+        <input name="limit_mailbox" id="limit_mailbox" value="{tmpl_var name='limit_mailbox'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_mailalias">{tmpl_var name='limit_mailalias_txt'}</label>
+        <input name="limit_mailalias" id="limit_mailalias" value="{tmpl_var name='limit_mailalias'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_mailforward">{tmpl_var name='limit_mailforward_txt'}</label>
+        <input name="limit_mailforward" id="limit_mailforward" value="{tmpl_var name='limit_mailforward'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_mailcatchall">{tmpl_var name='limit_mailcatchall_txt'}</label>
+        <input name="limit_mailcatchall" id="limit_mailcatchall" value="{tmpl_var name='limit_mailcatchall'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_mailrouting">{tmpl_var name='limit_mailrouting_txt'}</label>
+        <input name="limit_mailrouting" id="limit_mailrouting" value="{tmpl_var name='limit_mailrouting'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_mailfilter">{tmpl_var name='limit_mailfilter_txt'}</label>
+        <input name="limit_mailfilter" id="limit_mailfilter" value="{tmpl_var name='limit_mailfilter'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_fetchmail">{tmpl_var name='limit_fetchmail_txt'}</label>
+        <input name="limit_fetchmail" id="limit_fetchmail" value="{tmpl_var name='limit_fetchmail'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_mailquota">{tmpl_var name='limit_mailquota_txt'}</label>
+        <input name="limit_mailquota" id="limit_mailquota" value="{tmpl_var name='limit_mailquota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_spamfilter_wblist">{tmpl_var name='limit_spamfilter_wblist_txt'}</label>
+        <input name="limit_spamfilter_wblist" id="limit_spamfilter_wblist" value="{tmpl_var name='limit_spamfilter_wblist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_spamfilter_user">{tmpl_var name='limit_spamfilter_user_txt'}</label>
+        <input name="limit_spamfilter_user" id="limit_spamfilter_user" value="{tmpl_var name='limit_spamfilter_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_spamfilter_policy">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
+        <input name="limit_spamfilter_policy" id="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_web_domain">{tmpl_var name='limit_web_domain_txt'}</label>
+        <input name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_web_aliasdomain">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
+        <input name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_web_subdomain">{tmpl_var name='limit_web_subdomain_txt'}</label>
+        <input name="limit_web_subdomain" id="limit_web_subdomain" value="{tmpl_var name='limit_web_subdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_ftp_user">{tmpl_var name='limit_ftp_user_txt'}</label>
+        <input name="limit_ftp_user" id="limit_ftp_user" value="{tmpl_var name='limit_ftp_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_shell_user">{tmpl_var name='limit_shell_user_txt'}</label>
+        <input name="limit_shell_user" id="limit_shell_user" value="{tmpl_var name='limit_shell_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_dns_zone">{tmpl_var name='limit_dns_zone_txt'}</label>
+        <input name="limit_dns_zone" id="limit_dns_zone" value="{tmpl_var name='limit_dns_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_dns_record">{tmpl_var name='limit_dns_record_txt'}</label>
+        <input name="limit_dns_record" id="limit_dns_record" value="{tmpl_var name='limit_dns_record'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_database">{tmpl_var name='limit_database_txt'}</label>
+        <input name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+        <label for="limit_cron">{tmpl_var name='limit_cron_txt'}</label>
+        <input name="limit_cron" id="limit_cron" value="{tmpl_var name='limit_cron'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+            </div>
+      <div class="ctrlHolder">
+        <label for="limit_cron_type">{tmpl_var name='limit_cron_type_txt'}</label>
+        <select name="limit_cron_type" id="limit_cron_type" class="selectInput formLengthHalf">
+          {tmpl_var name='limit_cron_type'}
+        </select>
+            </div>
+      <div class="ctrlHolder">
+        <label for="limit_cron_frequency">{tmpl_var name='limit_cron_frequency_txt'}</label>
+        <input name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+            </div>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="buttonHolder buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/client_template_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_template_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>