diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 468f5532ca..2c49ce86e4 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-17  Miguel de Dios  <miguel.dedios@artica.es>
+
+	* godmode/agentes/modificar_agente.php: added better message when could
+	delete agent with remote config.
+
 2011-08-17  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* include/functions_agents.php: check if Pandora can delete the conf and md5
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index c7c1c8a525..ae24ab2b91 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -76,6 +76,14 @@ ui_print_page_header (__('Agent configuration')." &raquo; ".__('Agents defined i
 
 if (isset($result)) {
 	ui_print_result_message($result, __('Success deleted agent.'), __('Could not be deleted.'));
+	if (isset ($config["remote_config"])) {
+			$agent_md5 = md5 (agents_get_name($id_agente, ""), FALSE);
+				
+			if (file_exists ($config["remote_config"]."/md5/".$agent_md5.".md5") ||
+				file_exists ($config["remote_config"]."/conf/".$agent_md5.".conf")) {
+				ui_print_error_message(__('Maybe the files conf or md5 could not be deleted'));
+			}
+	}
 }
 
 // Show group selector