diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index b807fb8c95..ec6cef4f0e 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-02  Ramon Novoa  <rnovoa@artica.es>
+
+	* lib/PandoraFMS/Core.pm: Added the macros _agentcustomid_ and
+	  _modulecustomid_.
+
 2014-08-27 Hirofumi Kosaka <kosaka@rworks.jp>
 
 	* lib/PandoraFMS/PluginServer.pm: Fixed that _plugin_param2_
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 01451fcb3b..c78aa404a7 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -833,6 +833,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 				_field9_ => $field9,
 				_field10_ => $field10,
 				_agent_ => (defined ($agent)) ? $agent->{'nombre'} : '',
+				_agentcustomid_ => (defined ($agent)) ? $agent->{'custom_id'} : '',
 				_agentdescription_ => (defined ($agent)) ? $agent->{'comentarios'} : '',
 				_agentgroup_ => (defined ($group)) ? $group->{'nombre'} : '',
 				_agentstatus_ => (defined ($agent)) ? get_agent_status ($pa_config, $dbh, $agent->{'id_agente'}) : '',
@@ -851,6 +852,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 				_groupcontact_ => (defined ($group)) ? $group->{'contact'} : '',
 				_groupother_ => (defined ($group)) ? $group->{'other'} : '',
 				_module_ => (defined ($module)) ? $module->{'nombre'} : '',
+				_modulecustomid_ => (defined ($module)) ? $module->{'custom_id'} : '',
 				_modulegroup_ => (defined ($module)) ? (get_module_group_name ($dbh, $module->{'id_module_group'}) || '') : '',
 				_moduledescription_ => (defined ($module)) ? $module->{'descripcion'} : '',
 				_modulestatus_ => (defined ($module)) ? get_agentmodule_status_str($pa_config, $dbh, $module->{'id_agente_modulo'}) : '',