diff --git a/pandora_console/include/javascript/pandora_alerts.js b/pandora_console/include/javascript/pandora_alerts.js
index 389aa15475..f6e8f3857d 100644
--- a/pandora_console/include/javascript/pandora_alerts.js
+++ b/pandora_console/include/javascript/pandora_alerts.js
@@ -1,4 +1,5 @@
-var original_command = "";
+/* globals $ */
+
 function parse_alert_command(command, classs) {
   if (classs == "recovery") {
     classs = "fields_recovery";
@@ -9,16 +10,20 @@ function parse_alert_command(command, classs) {
   var nfield = 1;
   $("." + classs).each(function() {
     // Only render values different from ''
-    if ($(this).val() == "") {
-      nfield++;
-
-      return;
-    }
     var field = "_field" + nfield + "_";
-
     var regex = new RegExp(field, "gi");
-
-    if ($(this).css("-webkit-text-security") == "disc") {
+    console.log($(this).val());
+    if ($(this).val() == "") {
+      if (
+        classs == "fields_recovery" &&
+        $($(".fields")[nfield - 1]).val() != ""
+      ) {
+        command = command.replace(
+          regex,
+          "[RECOVER]" + $($(".fields")[nfield - 1]).val()
+        );
+      }
+    } else if ($(this).css("-webkit-text-security") == "disc") {
       var hidden_character = "*";
       var hidden_string = hidden_character.repeat($(this).val().length);
 
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index c543908d31..415f1572ad 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -3174,6 +3174,12 @@ table.alert_escalation th img {
   width: 18px;
 }
 
+.action_details td.used_field {
+  background: #6eb432;
+  color: #8d8d8d;
+  font-weight: normal;
+}
+
 td.used_field {
   background: #6eb432;
   color: #ffffff;