diff --git a/pandora_server/lib/PandoraFMS/PluginServer.pm b/pandora_server/lib/PandoraFMS/PluginServer.pm
index 9063be2c43..1a66d09a33 100644
--- a/pandora_server/lib/PandoraFMS/PluginServer.pm
+++ b/pandora_server/lib/PandoraFMS/PluginServer.pm
@@ -216,9 +216,11 @@ sub data_consumer ($$) {
 	
 	# Agent and module macros
 	my %macros = (_agent_ => (defined ($agent)) ? $agent->{'alias'} : '',
+				_agentalias_ => (defined ($agent)) ? $agent->{'alias'} : '',
 				_agentdescription_ => (defined ($agent)) ? $agent->{'comentarios'} : '',
 				_agentstatus_ => undef,
 				_agentgroup_ => (defined ($group)) ? $group->{'nombre'} : '',
+				_agentname_ => (defined ($agent)) ? $agent->{'nombre'} : '',
 				_address_ => (defined ($agent)) ? $agent->{'direccion'} : '',
 				_module_ => (defined ($module)) ? $module->{'nombre'} : '',
 				_modulegroup_ => undef,