diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 88c0b02c38..26cafee9e0 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-02  Ramon Novoa  <rnovoa@artica.es>
+
+	* lib/PandoraFMS/Core.pm: Added a suffix to the auto-monitoring XML
+	  so that it does not conflict with a local agent.
+
+	* util/pandora_manage.pl: Fixed a couple of bugs.
+
 2013-04-02  Junichi Satoh <junichi@rworks.jp>
 
 	* lib/PandoraFMS/Core.pm: Added group ACL to 'Special days list'.
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 97ad672f94..df65910182 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -3735,7 +3735,7 @@ sub pandora_self_monitoring ($$) {
 	
 	$xml_output .= "</agent_data>";
 	
-	my $filename = $pa_config->{"incomingdir"}."/".$pa_config->{'servername'}.".".$utimestamp.".data";
+	my $filename = $pa_config->{"incomingdir"}."/".$pa_config->{'servername'}.".".$utimestamp.".self.data";
 	
 	open (XMLFILE, ">> $filename") or die "[FATAL] Could not open internal monitoring XML file for deploying monitorization at '$filename'";
 	print XMLFILE $xml_output;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 34df35a6cc..5d9f97d26e 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -1095,7 +1095,7 @@ sub cli_create_network_module($) {
 	my $policy_id;
 	
 	if($in_policy == 0) {
-		my $agent_id = get_agent_id($dbh,$agent_name);
+		$agent_id = get_agent_id($dbh,$agent_name);
 		exist_check($agent_id,'agent',$agent_name);
 		
 		my $module_exists = get_agent_module_id($dbh, $module_name, $agent_id);
@@ -1222,7 +1222,7 @@ sub cli_create_snmp_module($) {
 	my $policy_id;
 	
 	if($in_policy == 0) {
-		my $agent_id = get_agent_id($dbh,$agent_name);
+		$agent_id = get_agent_id($dbh,$agent_name);
 		exist_check($agent_id,'agent',$agent_name);
 		
 		my $module_exists = get_agent_module_id($dbh, $module_name, $agent_id);
@@ -1353,7 +1353,7 @@ sub cli_create_plugin_module($) {
 	my $policy_id;
 
 	if($in_policy == 0) {
-		my $agent_id = get_agent_id($dbh,$agent_name);
+		$agent_id = get_agent_id($dbh,$agent_name);
 		exist_check($agent_id,'agent',$agent_name);
 		
 		my $module_exists = get_agent_module_id($dbh, $module_name, $agent_id);