diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 8138171b1a..5249e43dbd 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-18  Miguel de Dios  <miguel.dedios@artica.es>
+	* godmode/agentes/agent_template.php: refine the query to extract modules
+	from DB, now the query don't search modules are pending to delete.
+	Fixes: 2824695
+
 2009-08-18  Miguel de Dios  <miguel.dedios@artica.es>
 	* ChangeLog: add comments of last commits, I forget update file.
 
diff --git a/pandora_console/godmode/agentes/agent_template.php b/pandora_console/godmode/agentes/agent_template.php
index 755409788b..b35eb3fd85 100644
--- a/pandora_console/godmode/agentes/agent_template.php
+++ b/pandora_console/godmode/agentes/agent_template.php
@@ -111,7 +111,7 @@ echo '</div></form>';
 // ==========================
 echo "<h3>".__('Assigned modules')."</h3>";
 
-$sql = sprintf ("SELECT * FROM tagente_modulo WHERE id_agente = %d ORDER BY id_module_group, nombre", $id_agente);
+$sql = sprintf ("SELECT * FROM tagente_modulo WHERE id_agente = %d AND delete_pending = false ORDER BY id_module_group, nombre", $id_agente);
 $result = get_db_all_rows_sql ($sql);
 if ($result === false) {
 	$result = array ();