diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 4b1abc6a9c..208392afd6 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-08 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* godmode/agentes/agent_template.php: Fixed duplication of modules
+	when template is applied several times. 
+	
+	Bug id: #3599442
+
 2013-01-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	* godmode/agentes/agent_template.php: Fixed duplication of modules
diff --git a/pandora_console/godmode/agentes/agent_template.php b/pandora_console/godmode/agentes/agent_template.php
index bea2fe3974..f29661b7c8 100644
--- a/pandora_console/godmode/agentes/agent_template.php
+++ b/pandora_console/godmode/agentes/agent_template.php
@@ -99,7 +99,7 @@ if (isset ($_POST["template_id"])) {
 				);
 			
 			// Check if this module exists in the agent
-			$module_name_check = db_get_value_filter('id_agente_modulo', 'tagente_modulo', array('delete_pending' => 0, 'nombre' => $row2["name"]));
+			$module_name_check = db_get_value_filter('id_agente_modulo', 'tagente_modulo', array('delete_pending' => 0, 'nombre' => $row2["name"], 'id_agente' => $id_agente));
 			
 			if ($module_name_check !== false) {
 				$modules_already_added[] = $row2["name"];