diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index ecfa30f3dcd4e15e71c4e2682057f099675cc216..5c47fe5fa187c071ac50ffbee1cbda0f27b832ff 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -96,6 +96,10 @@ class page_action extends tform_actions {
 		//* Resellers shall not be able to create another reseller
 		if($_SESSION["s"]["user"]["typ"] == 'user') {
 			$this->dataRecord['limit_client'] = 0;
+		} else {
+			if($this->dataRecord["reseller"]) {
+				$this->dataRecord["limit_client"] = 1; // allow 1 client, template limits will be applied later, if we set -1 it would override template limits
+			}
 		}
 
 		if($this->id != 0) {
@@ -223,7 +227,7 @@ class page_action extends tform_actions {
 		
 		if($app->auth->is_admin()) {
 			// Fill the client select field
-			$sql = "SELECT client.client_id, sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 AND client.limit_client > 0 ORDER BY client.company_name, client.contact_name, sys_group.name";
+			$sql = "SELECT client.client_id, sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 AND client.limit_client != 0 ORDER BY client.company_name, client.contact_name, sys_group.name";
 			$clients = $app->db->queryAllRecords($sql);
 			$client_select = "<option value='0'>- ".$app->tform->lng('none_txt')." -</option>";
 			//$tmp_data_record = $app->tform->getDataRecord($this->id);
diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng
index 493ad190dc3b0fd18bb8d340df45fb0984b7ff7f..d14df622a35715c19c614f4e3b8d0df4d3cc2eb9 100644
--- a/interface/web/client/lib/lang/en_client.lng
+++ b/interface/web/client/lib/lang/en_client.lng
@@ -176,4 +176,5 @@ $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
 $wb['limit_database_quota_txt'] = 'Database quota';
 $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
 ?>
diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng
index 83d2833b913d561c7ad1816f1b42ef7264ce35ea..92b3d49321615105b45964458d5bd6da99dad56d 100644
--- a/interface/web/client/lib/lang/es_client.lng
+++ b/interface/web/client/lib/lang/es_client.lng
@@ -155,4 +155,7 @@ $wb['added_by_txt'] = 'Creado por';
 $wb['added_date_txt'] = 'Fecha de alta';
 $wb['parent_client_id_txt'] = 'Cliente de revendedor';
 $wb['none_txt'] = 'ninguno';
+$wb['limit_database_quota_txt'] = 'Cuota de base de datos';
+$wb['limit_database_quota_error_notint'] = 'Cuota de base de datos debe ser un número.';
+$wb['reseller_txt'] = 'Revendedor';
 ?>
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
index 311fd5217abf37ecb26b6b83c1352140982032b5..94f31a2bb28c5fdf084c302d361013a7704b2588 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -44,6 +44,10 @@
                         {tmpl_var name='parent_client_id'}
                     </select>
                 </div>
+                <div class="ctrlHolder">
+                    <label for="reseller">{tmpl_var name='reseller_txt'}</label>
+                    <input type="checkbox" name="reseller" value="1" id="reseller" />
+                </div>
                 </tmpl_if>
             <div class="subsectiontoggle"><span class="showing"></span>{tmpl_var name='web_limits_txt'}<em class="showing"></em></div>
             <div>
@@ -331,7 +335,7 @@ jQuery('div.panel_client')
         .find('div.pnl_formsarea')
         .find('fieldset')
         .find('input,select,button')
-        .not('#template_master,#template_additional,#default_mailserver,#default_webserver,#default_dbserver,#default_dnsserver,#default_slave_dnsserver,#customer_no_template,#customer_no_start,#customer_no_counter,#parent_client_id')
+        .not('#template_master,#template_additional,#default_mailserver,#default_webserver,#default_dbserver,#default_dnsserver,#default_slave_dnsserver,#customer_no_template,#customer_no_start,#customer_no_counter,#parent_client_id,#reseller')
         .click(function(e) {
             if(custom_template_selected()) return true;
             e.preventDefault();