diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 700c4ead18..331fa31330 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-27  Vanessa Gil <vanessa.gil@artica.es>
+	
+	* godmode/alerts/alert_commands.php
+	  godmode/snmpconsole/snmp_alert.php: Fixed
+	bug:load recovery fields of alert actions.
+
 2014-03-27  Alejandro Gallardo <alejandro.gallardo@artica.es>
 	
 	* include/functions_config.php,
diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php
index df87850885..685095345f 100644
--- a/pandora_console/godmode/alerts/alert_commands.php
+++ b/pandora_console/godmode/alerts/alert_commands.php
@@ -40,6 +40,7 @@ if (is_ajax ()) {
 	$get_alert_command = (bool) get_parameter ('get_alert_command');
 	if ($get_alert_command) {
 		$id = (int) get_parameter ('id', 0);
+		$get_recovery_fields = (int)  get_parameter('get_recovery_fields', 1);
 		
 		// If command ID is not provided, check for action id
 		if ($id == 0) {
@@ -107,17 +108,13 @@ if (is_ajax ()) {
 			}
 			else {
 				$fields_rows[$i] =
-					'<tr id="table_macros-field' . $i . '" class="datos">
-						<td style="font-weight:bold;width:20%" class="datos">
-							' . $fdesc . '
-						</td>
-						<td class="datos">
-							' . $ffield . '
-						</td>
-						<td class="datos recovery_col">
-							' . $rfield . '
-						</td>
-					</tr>';
+					'<tr id="table_macros-field' . $i . '" class="datos">';
+				$fields_rows[$i] .=	'<td style="font-weight:bold;width:20%" class="datos">' . $fdesc . '</td>';
+				$fields_rows[$i] .=	'<td class="datos">' . $ffield . '</td>';
+				if ($get_recovery_fields) {
+					$fields_rows[$i] .=	'<td class="datos recovery_col">' . $rfield . '</td>';
+				}
+				$fields_rows[$i] .=	'</tr>';
 			}
 		}
 		
diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php
index 23603d5b1f..41151f7e8b 100644
--- a/pandora_console/godmode/snmpconsole/snmp_alert.php
+++ b/pandora_console/godmode/snmpconsole/snmp_alert.php
@@ -1080,6 +1080,10 @@ $(document).ready (function () {
 			value: this.value
 		});
 		
+		values.push ({
+			name: "get_recovery_fields",
+			value: "0"
+		});
 		jQuery.get (
 			<?php
 			echo "'" . ui_get_full_url("ajax.php", false, false, false) . "'";