diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index c1af73bbae..7960c6bd18 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-04  Evi Vanoost  <vanooste@rcbi.rochester.edu>
+	
+	* godmode/agentes/configurar_agente.php: get_agent_id changed and caused
+	erroneous behaviour. Fixed it.
+
 2009-05-04  Esteban Sánchez  <estebans@artica.es>
 
 	* extensions/dbmanager.php: Code cleanup, making it easier an without
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 40a56bc7db..49b8683a4c 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -286,7 +286,7 @@ if (isset($_POST["update_agent"])) { // if modified some agent paramenter
 	if ($nombre_agente == "") { 
 		echo '<h3 class="error">'.__('No agent name specified').'</h3>';	
 	//If there is an agent with the same name, but a different ID
-	} elseif (get_agent_id ($nombre_agente) != $id_agente) {
+	} elseif (get_agent_id ($nombre_agente) > 0 && get_agent_id ($nombre_agente) != $id_agente) {
 		echo '<h3 class="error">'.__('There is already an agent in the database with this name').'</h3>';
 	} else {
 		//If different IP is specified than previous, add the IP