diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 308594f43a..d965015c78 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,12 +1,19 @@
+2013-08-30 Miguel de Dios <miguel.dedios@artica.es>
+	
+	* godmode/agentes/agent_manager.php: set the first default server
+	when create a new agent.
+	
+	MERGED FROM THE BRANCH 4.0
+
 2013-08-30 Miguel de Dios <miguel.dedios@artica.es>
 	
 	* operation/agentes/estado_generalagente.php: show a warning
 	message when the agent has not a assigned server.
 	
 	* operation/agentes/ver_agente.php: some changes for to make more
-	easy the merge with the trunk.
+	easy the merge with the last branch.
 	
-	MERGED FROM THE TRUNK.
+	MERGED FROM THE BRANCH 4.0
 
 2013-08-30 Miguel de Dios <miguel.dedios@artica.es>
 	
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index bbd75967fa..19cebfbfaa 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -112,6 +112,10 @@ if (! isset ($id_agente) && ! $new_agent) {
 if ($new_agent) {
 	if (! empty ($direccion_agente) && empty ($nombre_agente))
 		$nombre_agente = $direccion_agente;
+	
+	$servers = servers_get_names();
+	if (!empty($servers))
+		$server_name = reset(array_keys($servers));
 }
 
 echo '<div style="height: 5px">&nbsp;</div>';