diff --git a/new_service_webdns.php b/new_service_webdns.php
index f2e5f13..893e94a 100755
--- a/new_service_webdns.php
+++ b/new_service_webdns.php
@@ -146,7 +146,7 @@ class page_action extends tform_actions {
 		$global_config = $app->getconf->get_global_config('sites');
 		$dbuser_prefix = $app->tools_sites->replacePrefix($global_config['dbuser_prefix'], $this->dataRecord);
 		$ftpuser_prefix = $app->tools_sites->replacePrefix($global_config['ftpuser_prefix'], $this->dataRecord);
-
+		
 		$this->dataRecord['username_prefix'] = $ftpuser_prefix;
 		$this->dataRecord['database_user_prefix'] = $dbuser_prefix;
 		$valor2 = $this->dataRecord['database_user_prefix'] = $dbuser_prefix;
@@ -644,6 +644,16 @@ class page_action extends tform_actions {
 		
 		$fields = $app->tform->encode($this->dataRecord, $app->tform->getCurrentTab(), true);
 
+		//Captura del servidor id
+		if($this->id > 0) {
+			$server_id = $this->dataRecord["server_id"];
+		} else {
+			// Get the first server ID
+			$tmp = $app->db->queryOneRecord("SELECT server_id FROM server WHERE web_server = 1 ORDER BY server_name LIMIT 0,1");
+			$server_id = $tmp['server_id'];
+			//$this->elServidor = $server_id;
+		}
+
 		$dns_ip_servidor_ipv6 = $app->db->queryOneRecord("SELECT ip_type, ip_address FROM server_ip WHERE client_id = ".$fields['client_id']."  AND ip_type='IPv6'");
 		
 		//Comprobamos que el resultado para el cliente seleccionado no esta vacío,
@@ -666,7 +676,7 @@ class page_action extends tform_actions {
 		$paramsite = array(
 			'type' => 'vhost',
 			'domain' => $fields['domain'], //$this->subdominio,
-			'server_id' => $dns_servidor['default_webserver'],
+			'server_id' => $server_id,//$dns_servidor['default_webserver'],
 			'ip_address' => '*', //$dns_ip_servidor['ip_address'], 
 			'ipv6_address' => $dns_ip_servidor_ipv6['ip_address'],
 			'traffic_quota' => '-1', 
@@ -709,10 +719,10 @@ class page_action extends tform_actions {
 		//$formulario = $app->remoting_lib->loadFormDef('../sites/form/web_vhost_domain.tform.php');
 		//$formulario = $app->tform->loadFormDef('../sites/form/web_vhost_domain.tform.php');
 
-		/*print 'Valores: ' . $dns_ip_servidor_ipv6;
-		print "<pre> Parametros:"; print_r($paramsite); print "</pre>\n";
+		//print 'Valores: ' . $dns_ip_servidor_ipv6;
+		//print "<pre> Parametros:"; print_r($paramsite); print "</pre>\n";
 
-		print '<pre> cliente id ' . $fields['client_id'];
+		/*print '<pre> cliente id ' . $fields['client_id'];
 		print "<pre>";print_r($fields);print "</pre>\n" . $fields['client_id'];*/
 		//print "<pre>Formulario ";print_r($formulario);print "</pre>\n";
 		
@@ -769,6 +779,16 @@ class page_action extends tform_actions {
 		//Carga de campos del formulario.
 		$fields = $app->tform->encode($this->dataRecord, $app->tform->getCurrentTab(), true);
 
+		//Captura del servidor id
+		if($this->id > 0) {
+			$server_id = $this->dataRecord["server_id"];
+		} else {
+			// Get the first server ID
+			$tmp = $app->db->queryOneRecord("SELECT server_id FROM server WHERE web_server = 1 ORDER BY server_name LIMIT 0,1");
+			$server_id = $tmp['server_id'];
+			//$this->elServidor = $server_id;
+		}
+
 		// client prefix and group id
 		$res = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$app->functions->intval($fields['client_id']));
 		$client_group_id = $res['groupid'];
@@ -786,9 +806,14 @@ class page_action extends tform_actions {
 		$template_record = $app->db->queryOneRecord("SELECT * FROM dns_template WHERE visible = 'Y' AND name = 'webdns'"); /*'open6hosting'");*/
 		
 		//Llamada a la tabla server_ip para recuperar la ip4 e ip6
-		$dns_ip_servidor = $app->db->queryOneRecord("SELECT ip_type, ip_address FROM server_ip WHERE client_id = ".$app->functions->intval($fields['client_id']. " AND ip_type='IPv4'"));
-
-		$dns_ip_servidor_ipv6 = $app->db->queryOneRecord("SELECT ip_type, ip_address FROM server_ip WHERE client_id = ".$fields['client_id']."  AND ip_type='IPv6'");
+		//$dns_ip_servidor = $app->db->queryOneRecord("SELECT ip_type, ip_address FROM server_ip WHERE client_id = ".$app->functions->intval($fields['client_id']. " AND ip_type='IPv4'"));
+//PROVISIONAL
+$dns_ip_servidor = $app->db->queryOneRecord("SELECT ip_type, ip_address FROM server_ip WHERE client_id = 1 AND ip_type='IPv4'");
+		//$dns_ip_servidor_ipv6 = $app->db->queryOneRecord("SELECT ip_type, ip_address FROM server_ip WHERE client_id = ".$fields['client_id']."  AND ip_type='IPv6'");
+//PROVISIONAL
+$dns_ip_servidor_ipv6 = $app->db->queryOneRecord("SELECT ip_type, ip_address FROM server_ip WHERE client_id = 1 AND ip_type='IPv6'");
+
+		//$dns_ip_servidor_ipv6 = $app->db->queryOneRecord("SELECT ip_type, ip_address FROM server_ip WHERE client_id = ".$fields['client_id']."  AND ip_type='IPv6'");
 		
 		//Comprobamos que el resultado para el cliente seleccionado no esta vacío,
 		//si lo esta tomamos los datos del cliente id 0
@@ -880,7 +905,7 @@ class page_action extends tform_actions {
 			"sys_perm_user" => 'riud',
 			"sys_perm_group" => 'riud',
 			"sys_perm_other" => '',
-			"server_id" => $dns_servidor['default_dnsserver'],
+			"server_id" => $server_id,//$dns_servidor['default_dnsserver'],
 			"origin" => $origin,
 			"ns" => $ns,
 			"mbox" => $mbox,
@@ -907,7 +932,7 @@ class page_action extends tform_actions {
 					"sys_perm_user" => 'riud',
 					"sys_perm_group" => 'riud',
 					"sys_perm_other" => '',
-					"server_id" => $dns_servidor['default_dnsserver'],
+					"server_id" => $server_id,//$dns_servidor['default_dnsserver'],
 					"zone" => $dns_soa_id,
 					"name" => $rr['name'],
 					"type" => $rr['type'],
@@ -927,7 +952,7 @@ class page_action extends tform_actions {
 		$paramsite = array(
 			'type' => 'vhost',
 			'domain' => $fields['domain'],
-			'server_id' => $dns_servidor['default_webserver'],
+			'server_id' => $server_id,//$dns_servidor['default_webserver'],
 			'ip_address' => '*', //$dns_ip_servidor['ip_address'], 
 			'ipv6_address' => $dns_ip_servidor_ipv6['ip_address'],
 			'traffic_quota' => '-1', 
diff --git a/templates/new_service_webdns.htm b/templates/new_service_webdns.htm
index 06bef20..2bb59e1 100755
--- a/templates/new_service_webdns.htm
+++ b/templates/new_service_webdns.htm
@@ -6,14 +6,14 @@
 
 </div>
 
-<div class="form-group">
-    <label class="col-sm-3 control-label" for="client_id">{tmpl_var name='client_id_txt'}</label>
+<!--div class="form-group">
+    <label class="col-sm-3 control-label" for="client_no_id">{tmpl_var name='client_id_txt'}</label>
     <div class="col-sm-9">
-        <select class="form-control" id="client_id" name="client_id">
-			{tmpl_var name='client_id'}
+        <select class="form-control" id="client_no_id" name="client_no_id">
+			{tmpl_var name='client_no_id'}
         </select>
     </div>
-</div>
+</div-->
             <tmpl_if name="is_admin">
                 <div class="form-group">
                     <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>