diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index bbc1c73b2f..dfe497081e 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-17 Miguel de Dios <miguel.dedios@artica.es>
+
+	* godmode/events/events.php, operation/events/events_list.php,
+	operation/events/events.php: re-added and re-set the custom fields
+	by groups enterprise.
+
 2013-05-16 Miguel de Dios <miguel.dedios@artica.es>
 
 	* godmode/agentes/module_manager_editor_common.php: disabled
diff --git a/pandora_console/godmode/events/events.php b/pandora_console/godmode/events/events.php
index 54f4763398..c309f8d0b2 100644
--- a/pandora_console/godmode/events/events.php
+++ b/pandora_console/godmode/events/events.php
@@ -39,12 +39,20 @@ $buttons['filter'] = array('active' => false,
 			html_print_image("images/filter_mc.png", true, array ("title" => __('Create filter'))) . '</a>');
 
 if (check_acl ($config["id_user"], 0, "PM")) {
-	$buttons['responses'] = array('active' => false, 	
+	$buttons['responses'] = array('active' => false,
 				'text' => '<a href="index.php?sec=geventos&sec2=godmode/events/events&amp;section=responses&amp;pure='.$config['pure'].'">' .
 				html_print_image("images/event_responses.png", true, array ("title" => __('Event responses'))) . '</a>');
-	$buttons['fields'] = array('active' => false, 	
-				'text' => '<a href="index.php?sec=geventos&sec2=godmode/events/events&amp;section=fields&amp;pure='.$config['pure'].'">' .
+	
+	if (! defined ('METACONSOLE')) {
+		$buttons['fields'] = array('active' => false,
+				'text' => '<a href="index.php?sec=eventos&sec2=godmode/events/events&amp;section=fields&amp;pure='.$config['pure'].'">' .
 				html_print_image("images/custom_columns.png", true, array ("title" => __('Custom fields'))) . '</a>');
+	}
+	else {
+		$buttons['fields'] = array('active' => false,
+				'text' => '<a href="index.php?sec=eventos&sec2=event/custom_events&amp;section=fields&amp;pure='.$config['pure'].'">' .
+				html_print_image("images/custom_columns.png", true, array ("title" => __('Custom fields'))) . '</a>');
+	}
 }
 
 switch ($section) {
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 35dd27acb0..f1736a83f2 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -320,7 +320,7 @@ if ($config["pure"] == 0 || $meta) {
 	}
 	
 	// If the history event is not ebabled, dont show the history tab
-	if(!isset($config['metaconsole_events_history']) || $config['metaconsole_events_history'] != 1) {
+	if (!isset($config['metaconsole_events_history']) || $config['metaconsole_events_history'] != 1) {
 		unset($onheader['history']);
 	}
 	
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index 17501133b3..8f095ddb1e 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -488,7 +488,7 @@ else {
 	$result = events_get_events_grouped($sql_post, $offset, $pagination, $meta, $history);
 }
 
-if (!empty($result)) {		
+if (!empty($result)) {
 	$graph = '<fieldset class="databox tactical_set" style="width:93%;">
 			<legend>' . 
 				__('Events generated -by module-') .