diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index 34cdd2eae5074c777853edb408c76b52a5f7c1ea..3a8d4f2fccfc8c6ed044939233f4088e3efe4772 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -594,9 +594,7 @@ $form["tabs"]['limits'] = array (
 				'class'=> 'custom_datasource',
 				'function'=> 'client_servers'
 			),
-			'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
-					'errmsg'=> 'no_mail_server_error'),
-				1 => array ( 'type' => 'CUSTOM',
+			'validators'    => array (  0 => array ( 'type' => 'CUSTOM',
 					'class' => 'validate_client',
 					'function' => 'check_used_servers',
 					'errmsg'=> 'mail_servers_used'),
@@ -919,9 +917,7 @@ $form["tabs"]['limits'] = array (
 				'class'=> 'custom_datasource',
 				'function'=> 'client_servers'
 			),
-			'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
-					'errmsg'=> 'no_web_server_error'),
-				1 => array ( 'type' => 'CUSTOM',
+			'validators'    => array (  0 => array ( 'type' => 'CUSTOM',
 					'class' => 'validate_client',
 					'function' => 'check_used_servers',
 					'errmsg'=> 'web_servers_used'),
@@ -1141,9 +1137,7 @@ $form["tabs"]['limits'] = array (
 				'class'=> 'custom_datasource',
 				'function'=> 'client_servers'
 			),
-			'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
-					'errmsg'=> 'no_dns_server_error'),
-				1 => array ( 'type' => 'CUSTOM',
+			'validators'    => array (  0 => array ( 'type' => 'CUSTOM',
 					'class' => 'validate_client',
 					'function' => 'check_used_servers',
 					'errmsg'=> 'dns_servers_used'),
@@ -1238,9 +1232,7 @@ $form["tabs"]['limits'] = array (
 				'class'=> 'custom_datasource',
 				'function'=> 'client_servers'
 			),
-			'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
-					'errmsg'=> 'no_db_server_error'),
-				1 => array ( 'type' => 'CUSTOM',
+			'validators'    => array (  0 => array ( 'type' => 'CUSTOM',
 					'class' => 'validate_client',
 					'function' => 'check_used_servers',
 					'errmsg'=> 'db_servers_used'),
diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index b41cd5382e3ea43a7e1b64d24d4474ad24044054..1c60597985f71906b7dfb37b6ea1ebe9a4c9ea33 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -593,9 +593,7 @@ $form["tabs"]['limits'] = array (
 				'keyfield'=> 'server_id',
 				'valuefield'=> 'server_name'
 			),
-			'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
-					'errmsg'=> 'no_mail_server_error'),
-				1 => array ( 'type' => 'CUSTOM',
+			'validators'    => array (  0 => array ( 'type' => 'CUSTOM',
 					'class' => 'validate_client',
 					'function' => 'check_used_servers',
 					'errmsg'=> 'mail_servers_used'),
@@ -918,9 +916,7 @@ $form["tabs"]['limits'] = array (
 				'keyfield'=> 'server_id',
 				'valuefield'=> 'server_name'
 			),
-			'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
-					'errmsg'=> 'no_web_server_error'),
-				1 => array ( 'type' => 'CUSTOM',
+			'validators'    => array (  0 => array ( 'type' => 'CUSTOM',
 					'class' => 'validate_client',
 					'function' => 'check_used_servers',
 					'errmsg'=> 'web_servers_used'),
@@ -1138,9 +1134,7 @@ $form["tabs"]['limits'] = array (
 				'keyfield'=> 'server_id',
 				'valuefield'=> 'server_name'
 			),
-			'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
-					'errmsg'=> 'no_dns_server_error'),
-				1 => array ( 'type' => 'CUSTOM',
+			'validators'    => array (  0 => array ( 'type' => 'CUSTOM',
 					'class' => 'validate_client',
 					'function' => 'check_used_servers',
 					'errmsg'=> 'dns_servers_used'),
@@ -1238,9 +1232,7 @@ $form["tabs"]['limits'] = array (
 				'keyfield'=> 'server_id',
 				'valuefield'=> 'server_name'
 			),
-			'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
-					'errmsg'=> 'no_db_server_error'),
-				1 => array ( 'type' => 'CUSTOM',
+			'validators'    => array (  0 => array ( 'type' => 'CUSTOM',
 					'class' => 'validate_client',
 					'function' => 'check_used_servers',
 					'errmsg'=> 'db_servers_used'),
diff --git a/interface/web/client/templates/client_template_edit_limits.htm b/interface/web/client/templates/client_template_edit_limits.htm
index 5e0abb97967c751542aa10d3e6819f8f13cca616..6a09bb641ecbdf0776aba8bdebcb850768acfc0f 100644
--- a/interface/web/client/templates/client_template_edit_limits.htm
+++ b/interface/web/client/templates/client_template_edit_limits.htm
@@ -138,7 +138,7 @@
         </a>
       </h4>
     </div>
-    <div id="collapseMail" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingMail>
+    <div id="collapseMail" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingMail">
       <div class="panel-body">
                 <div class="form-group">
                     <label for="limit_maildomain" class="col-sm-3 control-label">{tmpl_var name='limit_maildomain_txt'}</label>