diff --git a/pandora_console/godmode/agentes/planned_downtime.list.php b/pandora_console/godmode/agentes/planned_downtime.list.php
index 959db70ed6..6ee46ff7f1 100755
--- a/pandora_console/godmode/agentes/planned_downtime.list.php
+++ b/pandora_console/godmode/agentes/planned_downtime.list.php
@@ -89,7 +89,7 @@ if (is_ajax() === true) {
             [
                 'id'                  => 'agent_modules_affected_planned_downtime',
                 'class'               => 'info_table',
-                'style'               => 'width: 100%',
+                'style'               => 'width: 99%',
                 'columns'             => $columns,
                 'column_names'        => $column_names,
                 'ajax_url'            => 'godmode/agentes/planned_downtime.list',
@@ -730,7 +730,7 @@ if ($downtimes === false && $filter_performed === false) {
     $table->cellstyle = [];
 
     $table->head = [];
-    $table->head['name'] = __('Name #Ag.');
+    $table->head['name'] = __('Name (Ag.)');
     $table->head['description'] = __('Description');
     $table->head['group'] = __('Group');
     $table->head['type'] = __('Type');
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 284f224023..cbb4ea851e 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -2397,7 +2397,8 @@ sub pandora_planned_downtime_cron_start($$) {
 				$dbh, $downtime->{'id'});
 			}
 			elsif (($downtime->{'type_downtime'} eq "disable_agents")
-				|| ($downtime->{'type_downtime'} eq "disable_agents_alerts")) {
+				|| ($downtime->{'type_downtime'} eq "disable_agents_alerts")
+				|| ($downtime->{'type_downtime'} eq "disable_agent_modules")) {
 				pandora_planned_downtime_set_disabled_elements($pa_config,
 				$dbh, $downtime);
 			}
@@ -2448,7 +2449,8 @@ sub pandora_planned_downtime_cron_stop($$) {
 					$dbh, $downtime->{'id'});
 			}
 			elsif (($downtime->{'type_downtime'} eq "disable_agents")
-				|| ($downtime->{'type_downtime'} eq "disable_agents_alerts")) {
+				|| ($downtime->{'type_downtime'} eq "disable_agents_alerts")
+				|| ($downtime->{'type_downtime'} eq "disable_agent_modules")) {
 					pandora_planned_downtime_unset_disabled_elements($pa_config,
 						$dbh, $downtime);
 			}
@@ -2856,7 +2858,8 @@ sub pandora_planned_downtime_monthly_start($$) {
 			pandora_planned_downtime_set_quiet_elements($pa_config, $dbh, $downtime->{'id'});
 		}
 		elsif (($downtime->{'type_downtime'} eq "disable_agents")
-			|| ($downtime->{'type_downtime'} eq "disable_agents_alerts")) {
+			|| ($downtime->{'type_downtime'} eq "disable_agents_alerts")
+			|| ($downtime->{'type_downtime'} eq "disable_agent_modules")) {
 				
 			pandora_planned_downtime_set_disabled_elements($pa_config, $dbh, $downtime);
 		}
@@ -2934,7 +2937,8 @@ sub pandora_planned_downtime_monthly_stop($$) {
 				$dbh, $downtime->{'id'});
 		}
 		elsif (($downtime->{'type_downtime'} eq "disable_agents")
-			|| ($downtime->{'type_downtime'} eq "disable_agents_alerts")) {
+			|| ($downtime->{'type_downtime'} eq "disable_agents_alerts")
+			|| ($downtime->{'type_downtime'} eq "disable_agent_modules")) {
 				
 			pandora_planned_downtime_unset_disabled_elements($pa_config,
 				$dbh, $downtime);
@@ -3044,7 +3048,8 @@ sub pandora_planned_downtime_weekly_start($$) {
 				$dbh, $downtime->{'id'});
 			}
 			elsif (($downtime->{'type_downtime'} eq "disable_agents")
-				|| ($downtime->{'type_downtime'} eq "disable_agents_alerts")) {
+				|| ($downtime->{'type_downtime'} eq "disable_agents_alerts")
+				|| ($downtime->{'type_downtime'} eq "disable_agent_modules")) {
 				pandora_planned_downtime_set_disabled_elements($pa_config,
 				$dbh, $downtime);
 			}
@@ -3159,7 +3164,8 @@ sub pandora_planned_downtime_weekly_stop($$) {
 					$dbh, $downtime->{'id'});
 			}
 			elsif (($downtime->{'type_downtime'} eq "disable_agents")
-				|| ($downtime->{'type_downtime'} eq "disable_agents_alerts")) {
+				|| ($downtime->{'type_downtime'} eq "disable_agents_alerts")
+				|| ($downtime->{'type_downtime'} eq "disable_agent_modules")) {
 					pandora_planned_downtime_unset_disabled_elements($pa_config,
 						$dbh, $downtime);
 			}