diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 4b8b28c516..9ddfb5b173 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -25,7 +25,7 @@ Requires(preun):    chkconfig /bin/rm /usr/sbin/userdel
 Requires:           coreutils unzip
 Requires:           util-linux procps grep
 Requires:           /sbin/ip /bin/awk
-Requires:           perl(Sys::Syslog) perl(IO::Compress::Zip)
+Requires:           perl(Sys::Syslog) perl(IO::Compress::Zip) perl(File::Copy) perl(Sys::Hostname)
 # Required by plugins
 #Requires:           sh-utils sed passwd net-tools rpm
 AutoReq:            0
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec
index 9a5b2f7111..1c4f317d25 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec
@@ -26,9 +26,7 @@ Requires(preun):    chkconfig /bin/rm /usr/sbin/userdel
 Requires:           coreutils unzip
 Requires:           util-linux procps grep
 Requires:           /sbin/ip /bin/awk
-Requires:           perl(Sys::Syslog) perl(IO::Compress::Zip)
-# Required by plugins
-#Requires:           sh-utils sed passwd net-tools rpm
+#Requires:           libnsl
 AutoReq:            0
 Provides:           %{name}-%{version}
 
diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index 9521e870e1..add3ab4019 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -366,59 +366,37 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
             $header_autorefresh_counter .= '</div>';
         }
 
-        // Button for feedback pandora.
-        if (enterprise_installed() && $config['activate_feedback']) {
-            $header_feedback = '<div id="feedback-icon-header">';
-            $header_feedback .= '<div id="modal-feedback-form" class="invisible"></div>';
-            $header_feedback .= '<div id="msg-header" class="invisible"></div>';
-            $header_feedback .= html_print_image(
-                'images/send_feedback@header.svg',
-                true,
-                [
-                    'class' => 'main_menu_icon invert_filter',
-                    'title' => __('Feedback'),
-                    'id'    => 'feedback-header',
-                    'alt'   => __('Feedback'),
-                    'style' => 'cursor: pointer;',
-                ]
-            );
-            $header_feedback .= '</div>';
-        }
-
-
-        // Support.
-        if (enterprise_installed()) {
-            $header_support_link = $config['custom_support_url'];
+        $modal_box = '<div id="modal_help" class="invisible">
+        <div id="modal-feedback-form" class="invisible"></div>
+        <div id="msg-header" class="invisible"></div>
+            <a href="https://pandorafms.com/manual" target="_blank">'.__('Pandora documentation').'</a>';
+        if (enterprise_installed() === true) {
+            $modal_box .= '<a href="https://support.pandorafms.com/" target="_blank">'.__('Enterprise support ').'</a>';
+            $modal_box .= '<a href="#" id="feedback-header">'.__('Give us feedback').'</a>';
         } else {
-            $header_support_link = 'https://pandorafms.com/forums/';
+            $modal_box .= '<a href="https://pandorafms.com/community/forums/" target="_blank">'.__('Community Support').'</a>';
         }
 
-        $header_support = '<div id="header_support">';
-        $header_support .= '<a href="'.ui_get_full_external_url($header_support_link).'" target="_blank">';
-        $header_support .= html_print_image(
-            'images/support@header.svg',
-            true,
-            [
-                'title' => __('Go to support'),
-                'class' => 'main_menu_icon bot invert_filter',
-                'alt'   => 'user',
-            ]
-        );
-        $header_support .= '</a></div>';
+        $modal_box .= '<hr class="separator" />';
+        $modal_box .= '<a href="https://github.com/pandorafms/pandorafms/issues" target="_blank">'.__('Open an issue in Github').'</a>';
+        $modal_box .= '<a href="https://discord.com/invite/xVt2ruSxmr" target="_blank">'.__('Join discord community').'</a>';
+        $modal_box .= '</div>';
 
-        // Documentation.
-        $header_docu = '<div id="header_docu">';
-        $header_docu .= '<a href="'.ui_get_full_external_url($config['custom_docs_url']).'" target="_blank">';
-        $header_docu .= html_print_image(
-            'images/documentation@header.svg',
-            true,
+        $modal_help = html_print_div(
             [
-                'title' => __('Go to documentation'),
-                'class' => 'main_menu_icon bot invert_filter',
-                'alt'   => 'user',
-            ]
+                'id'      => 'modal-help-content',
+                'content' => html_print_image(
+                    'images/help@header.svg',
+                    true,
+                    [
+                        'title' => __('Help'),
+                        'class' => 'main_menu_icon bot invert_filter',
+                        'alt'   => 'user',
+                    ]
+                ).$modal_box,
+            ],
+            true,
         );
-        $header_docu .= '</a></div>';
 
 
         // User.
@@ -472,11 +450,11 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
                 echo '</span>';
             echo '</div>';
             echo '<div class="header_center"></div>';
-            echo '<div class="header_right">'.$header_support, $header_docu, $header_user, $header_logout.'</div>';
+            echo '<div class="header_right">'.$modal_help, $header_user, $header_logout.'</div>';
         } else {
             echo '<div class="header_left"><span class="header_title">'.$config['custom_title_header'].'</span><span class="header_subtitle">'.$config['custom_subtitle_header'].'</span></div>
             <div class="header_center">'.$header_searchbar.'</div>
-            <div class="header_right">'.$header_autorefresh, $header_autorefresh_counter, $header_discovery, $header_welcome, $servers_list, $header_feedback, $header_support, $header_docu, $header_user, $header_logout.'</div>';
+            <div class="header_right">'.$header_autorefresh, $header_autorefresh_counter, $header_discovery, $header_welcome, $servers_list, $modal_help, $header_user, $header_logout.'</div>';
         }
         ?>
     </div>    <!-- Closes #table_header_inner -->
@@ -1008,8 +986,6 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
         <?php if (enterprise_installed()) { ?>
             // Feedback.
             $("#feedback-header").click(function () {
-                // Clean DOM.
-                $("#feedback-header").empty();
                 // Function charge Modal.
                 show_feedback();
             });
@@ -1115,6 +1091,22 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
 
             return false;
         });
+
+
+        $(document).click(function(event) {
+            if (!$(event.target).closest('#modal-help-content').length &&
+                $('#modal_help').hasClass('invisible') === false) {
+                $('#modal_help').addClass('invisible');
+            }
+        });
+
+        $('#modal-help-content').on('click', (e) => {
+            if($(e.target).prop('tagName') === 'A') {
+                $('#modal_help').addClass('invisible');
+            } else {
+                $('#modal_help').removeClass('invisible');
+            }
+        });
     });
 /* ]]> */
 </script>
diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index d3d9c7e686..e18d278ac8 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -30,7 +30,7 @@ require_once __DIR__.'/../include/functions_html.php';
 echo '<style>
         :root {';
 if ($config['style'] === 'pandora') {
-    echo '--login-background-color: rgba(255, 255, 255, 0.4);';
+    echo '--login-background-color: rgba(255, 255, 255, 0.50);';
     echo '--login-label-color: #545454;';
     echo '--login-text-color: #000;';
     $style_theme = 'white-theme';
@@ -237,16 +237,18 @@ if (is_metaconsole() === true) {
         );
     }
 } else if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
+    $theme_logo = ($config['style'] === 'pandora') ? 'images/custom_logo_login/Pandora FMS alt black.png' : 'enterprise/images/custom_logo_login/'.$config['custom_logo_login'];
     if (!isset($config['custom_logo_login'])) {
-        html_print_image(ui_get_full_url('enterprise/images/custom_logo_login/Pandora-FMS-1.png'), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
+        html_print_image(ui_get_full_url($theme_logo), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
     } else {
-        html_print_image(ui_get_full_url('enterprise/images/custom_logo_login/'.$config['custom_logo_login']), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
+        html_print_image(ui_get_full_url($theme_logo), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
     }
 } else {
+    $theme_logo = ($config['style'] === 'pandora') ? 'images/custom_logo_login/Pandora FMS alt black.png' : 'images/custom_logo_login/'.$config['custom_logo_login'];
     if (empty($config['custom_logo_login']) === true) {
-        html_print_image(ui_get_full_url('images/custom_logo_login/Pandora-FMS-1.png'), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
+        html_print_image(ui_get_full_url($theme_logo), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
     } else {
-        html_print_image(ui_get_full_url('images/custom_logo_login/').$config['custom_logo_login'], false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
+        html_print_image(ui_get_full_url($theme_logo), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
     }
 }
 
diff --git a/pandora_console/godmode/users/user_management.php b/pandora_console/godmode/users/user_management.php
index 90bf79a50c..39995d52c2 100644
--- a/pandora_console/godmode/users/user_management.php
+++ b/pandora_console/godmode/users/user_management.php
@@ -592,6 +592,9 @@ $userManagementTable->data['line2_looknfeel'][0] = html_print_select_from_sql(
     true
 );
 
+// Hidden hint to change theme.
+$hin_change_theme = ui_print_help_tip(__('When changing the theme, the login screen logo will be restricted to the default for that color scheme, if you have a custom logo, adjust it after changing the theme.'), true, '', '', 'display: none;');
+
 if (is_metaconsole() === true) {
     if (users_is_admin() === true) {
         $userManagementTable->data['line1_looknfeel'][1] = $outputMetaAccess[0];
@@ -599,7 +602,7 @@ if (is_metaconsole() === true) {
     }
 } else {
     if (function_exists('skins_print_select')) {
-        $userManagementTable->data['line1_looknfeel'][1] = __('User color scheme');
+        $userManagementTable->data['line1_looknfeel'][1] = __('User color scheme').$hin_change_theme;
         $userManagementTable->data['line2_looknfeel'][1] = skins_print_select($id_usr, 'skin', $user_info['id_skin'], '', __('None'), 0, true);
     }
 }
@@ -817,5 +820,10 @@ $(document).ready(function () {
                 128,
                 128
             );
+
+    //Hint to change theme.
+    $('#skin1').on("change", () => {
+        $('#advanced-line1_looknfeel-1 > a').css('display', 'block');
+    })
 });
 </script>
\ No newline at end of file
diff --git a/pandora_console/images/custom_logo_login/Pandora FMS alt black.png b/pandora_console/images/custom_logo_login/Pandora FMS alt black.png
new file mode 100644
index 0000000000..629774dd73
Binary files /dev/null and b/pandora_console/images/custom_logo_login/Pandora FMS alt black.png differ
diff --git a/pandora_console/images/custom_logo_login/Pandora FMS alt black.svg b/pandora_console/images/custom_logo_login/Pandora FMS alt black.svg
new file mode 100644
index 0000000000..eebed4aa64
--- /dev/null
+++ b/pandora_console/images/custom_logo_login/Pandora FMS alt black.svg	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1252px" height="670px" viewBox="0 0 1252 670" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Logo Copy</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Logo-Copy">
+            <g id="Group-2" transform="translate(0, 557)">
+                <path d="M193.317737,62.0611037 L146.146883,62.0611037 C149.098389,49.8354526 151.674111,39.6263094 153.609326,36.8364509 C158.520389,24.2218365 177.7919,24.8258736 177.7919,24.8258736 L193.513997,25.0104406 L193.317737,62.0611037 Z M213.757679,4.3282692 L164.812879,4.91400221 C136.315628,4.71570718 127.675625,32.6951355 127.675625,32.6951355 C127.675625,32.6951355 111.361706,90.0405321 109.385414,100.679823 C107.424336,111.325215 114.894386,110.336791 114.894386,110.336791 C114.894386,110.336791 123.357906,110.588473 127.083803,110.336791 C132.790556,109.940201 134.947894,105.411447 134.947894,105.411447 L140.45078,84.521829 L192.585946,84.521829 L192.585946,103.187492 C192.585946,110.443565 199.79888,110.432888 199.79888,110.432888 L213.64966,110.432888 C220.039519,110.432888 220.435082,103.63747 220.435082,103.63747 L220.435082,11.6102727 C220.435082,5.90852804 213.757679,4.3282692 213.757679,4.3282692 L213.757679,4.3282692 Z M831.35568,62.0611037 L784.187869,62.0611037 C787.140897,49.8354526 789.715097,39.6263094 791.662483,36.8364509 C796.570503,24.2218365 815.832886,24.8258736 815.832886,24.8258736 L831.548897,25.0104406 L831.35568,62.0611037 Z M851.800187,4.3282692 L802.855386,4.91400221 C774.356614,4.71570718 765.712047,32.6951355 765.712047,32.6951355 C765.712047,32.6951355 749.404214,90.0405321 747.424879,100.679823 C745.468365,111.325215 752.932329,110.336791 752.932329,110.336791 C752.932329,110.336791 761.398892,110.588473 765.121746,110.336791 C770.826977,109.940201 772.981273,105.411447 772.981273,105.411447 L778.494809,84.521829 L830.619325,84.521829 L830.619325,103.187492 C830.619325,110.443565 837.836823,110.432888 837.836823,110.432888 L851.689125,110.432888 C858.08507,110.432888 858.473025,103.63747 858.473025,103.63747 L858.473025,11.6102727 C858.473025,5.90852804 851.800187,4.3282692 851.800187,4.3282692 L851.800187,4.3282692 Z M431.252665,88.3257377 L402.367459,88.1228666 L402.367459,25.4723154 L428.506547,25.0772507 C443.518152,24.8926838 454.502625,33.3629322 454.037078,57.3230729 C453.381357,90.4139369 431.252665,88.3257377 431.252665,88.3257377 M428.506547,3.79866895 L382.323079,3.79866895 C382.323079,3.79866895 375.245549,4.39355403 375.245549,10.8839028 L375.245549,101.924201 C375.245549,101.924201 374.656769,109.709568 383.006185,109.709568 L426.539384,109.709568 C426.539384,109.709568 482.952712,113.94393 482.952712,56.2110954 C482.952712,-1.52021383 428.506547,3.79866895 428.506547,3.79866895 M697.245618,49.7242549 L657.252706,49.7242549 L657.252706,23.7796386 L693.022226,23.6286293 C693.022226,23.6286293 708.729108,23.9214958 708.729108,36.7496587 C708.729108,49.5762963 697.245618,49.7242549 697.245618,49.7242549 M738.679291,104.537576 L718.126765,72.9568054 C718.126765,72.9568054 714.607779,65.7037834 708.433958,65.464304 C708.433958,65.464304 735.921002,59.9288221 735.921002,38.0614566 C735.921002,38.0614566 738.828388,4.67772606 700.157568,4.67772606 L634.722367,4.67772606 C634.722367,4.67772606 629.931494,5.40989231 629.931494,10.8050424 L629.931494,103.797783 C629.931494,103.797783 630.366613,110.65269 636.770165,110.65269 L652.326429,110.65269 C652.326429,110.65269 657.117302,110.362874 657.117302,101.030805 C657.117302,91.7002615 657.112738,70.4201543 657.112738,70.4201543 L680.516358,70.4201543 C680.516358,70.4201543 684.290939,70.1272878 687.208975,73.4738978 C690.123968,76.8327105 712.06857,107.304555 712.06857,107.304555 C712.06857,107.304555 713.961186,110.802174 718.624262,110.802174 L733.87929,110.802174 C733.87929,110.802174 742.463001,111.38028 738.679291,104.537576 M326.33285,11.6427626 C326.33285,11.6427626 326.3222,4.13348247 332.856592,4.13348247 L350.381542,4.13348247 C350.381542,4.13348247 355.163286,4.29059315 355.163286,10.0472503 L355.163286,103.482342 C355.163286,103.482342 354.998976,110.517239 346.87929,110.517239 L324.254624,110.517239 C324.254624,110.517239 320.594148,111.792429 315.339249,104.92837 C310.076744,98.0627862 271.845608,39.2667853 271.845608,39.2667853 L271.845608,104.601946 C271.845608,104.601946 271.679775,110.829935 264.185383,110.829935 L250.489785,110.829935 C250.489785,110.829935 244.434633,110.199967 244.434633,103.807241 L244.434633,9.40507951 C244.434633,9.40507951 244.109054,4.61244123 250.644967,4.61244123 L274.069887,4.61244123 C274.069887,4.61244123 278.527575,4.29059315 282.680983,11.3224399 C286.886119,18.4671623 326.167018,78.7305464 326.167018,78.7305464 L326.33285,11.6427626 Z M62.861001,65.9415849 L27.2679636,65.9415849 L27.2679636,25.8859894 C27.2679636,25.8859894 48.0137066,25.6266805 60.0479416,25.6266805 C72.0806551,25.6266805 78.742844,30.1264523 78.742844,44.882653 C78.742844,65.6731239 62.861001,65.9415849 62.861001,65.9415849 M66.5701622,4.44666401 L4.86998558,4.44666401 C0.77591148,4.44666401 0,9.58613812 0,9.58613812 C0,9.58613812 0.130839975,97.7740382 0.130839975,104.186594 C0.130839975,110.5961 4.99473998,110.856934 4.99473998,110.856934 L22.0252363,110.856934 C27.531165,110.856934 27.0138907,104.055414 27.0138907,104.055414 L27.0138907,86.5978254 L69.0059157,86.5978254 C74.887629,86.5978254 106.006243,83.9116904 106.006243,43.8560949 C106.006243,3.81880352 66.5701622,4.44666401 66.5701622,4.44666401 M586.189712,67.5383175 C586.189712,67.5383175 585.791107,87.6957697 565.877567,91.286435 C565.877567,91.286435 551.088086,93.8139339 539.995594,90.6839232 C528.644466,87.4837465 523.660376,75.1147129 523.263291,68.337599 C522.873814,61.5467569 523.263291,48.1618426 523.263291,48.1618426 C523.263291,48.1618426 521.671912,29.0034923 543.587608,22.418572 C543.587608,22.418572 555.313,19.023151 566.476997,22.616867 C566.476997,22.616867 583.400995,25.6217994 586.189712,45.5748552 L586.189712,67.5383175 Z M576.531897,2.61500017 C555.816582,-3.07759246 533.987605,2.29772812 533.987605,2.29772812 C493.285723,12.7494014 496.241794,43.1175222 496.241794,43.1175222 C496.241794,43.1175222 495.510003,64.3228873 496.241794,75.0948834 C496.975106,85.8470499 506.237359,105.464529 527.322373,110.518002 C547.938798,115.476903 575.428885,111.472869 575.428885,111.472869 C612.424649,105.780276 613.168611,73.8227445 613.168611,73.8227445 L613.168611,39.0082391 C607.994346,7.37255548 576.531897,2.61500017 576.531897,2.61500017 L576.531897,2.61500017 Z" id="Pandora" fill="#181818"></path>
+                <path d="M1119.9097,4.71174128 C1119.9097,4.71174128 1126.31934,4.96647412 1126.31934,12.7503166 C1126.31934,20.5097536 1125.24676,103.278098 1125.24676,103.278098 C1125.24676,103.278098 1125.77468,111.037535 1120.44067,111.037535 L1103.33411,111.037535 C1103.33411,111.037535 1096.92751,111.037535 1096.92751,104.602099 L1096.92751,32.0230679 L1071.0212,104.602099 C1071.0212,104.602099 1068.87146,111.037535 1064.34531,111.037535 L1053.65904,111.037535 C1053.65904,111.037535 1048.3235,111.574457 1044.84407,102.469664 C1041.36464,93.3587706 1018.66086,31.217685 1018.66086,31.217685 L1018.66086,103.537407 C1018.66086,103.537407 1017.60045,111.037535 1012.79132,111.037535 L998.094645,111.037535 C998.094645,111.037535 991.150998,111.833766 991.150998,101.389719 L991.150998,11.1380255 C991.150998,11.1380255 992.21141,5.50949743 996.763424,5.50949743 L1028.81313,5.50949743 C1028.81313,5.50949743 1035.49662,5.78405977 1038.95475,18.3666419 C1041.14252,26.293867 1058.46664,74.3422775 1058.46664,74.3422775 L1079.30215,12.7503166 C1079.30215,12.7503166 1081.43058,4.71174128 1088.92193,4.71174128 L1119.9097,4.71174128 Z M880.116087,10.9247821 L880.116087,103.856509 C880.116087,103.856509 880.540556,110.830393 887.07647,110.830393 L900.726426,110.830393 C900.726426,110.830393 906.407315,111.123259 906.407315,105.131699 L906.407315,72.6341946 L959.154082,72.6341946 C959.154082,72.6341946 965.478521,72.4923374 965.478521,66.2963805 L965.478521,56.6699195 C965.478521,56.6699195 964.971897,51.6942397 958.294494,51.6942397 L906.977838,51.6942397 L906.977838,24.5995122 L969.380899,24.5995122 C969.380899,24.5995122 976.780965,24.4607057 976.780965,16.763808 L976.780965,10.0644867 C976.780965,10.0644867 976.20892,4.65408319 969.812976,4.65408319 L884.094535,4.65408319 C884.094535,4.65408319 880.253013,5.07050274 880.116087,10.9247821 M1147.46263,34.4216751 C1146.57565,65.8773678 1199.92033,66.2571791 1212.21472,69.7639503 C1215.30315,70.6623794 1224.95032,70.4305267 1224.83774,81.776053 C1224.76927,89.8908956 1213.53986,90.4415457 1213.53986,90.4415457 L1185.49446,90.4415457 C1174.84926,90.4415457 1171.63455,86.2148109 1168.30878,80.877624 C1164.9891,75.5495891 1159.54554,75.7722897 1159.54554,75.7722897 C1159.54554,75.7722897 1144.35898,73.2066571 1147.02142,91.2118456 C1149.23353,106.212102 1168.08209,110.228339 1175.28742,110.667638 L1210.54727,110.786615 C1210.54727,110.786615 1247.12313,113.791548 1251.67819,84.8801328 C1251.67819,84.8801328 1256.32909,59.8736045 1230.26912,54.3182931 C1230.26912,54.3182931 1174.084,46.4490312 1172.62194,34.6489517 C1171.4109,24.7509791 1178.95246,24.5267532 1181.60577,24.5267532 L1211.54835,24.5267532 C1211.54835,24.5267532 1219.08534,24.3116794 1223.18094,31.6363926 C1227.28414,38.9672073 1234.37688,39.6459864 1236.58747,39.6459864 C1238.80414,39.6459864 1248.57454,40.8723649 1249.12072,30.6494935 C1249.12072,30.6494935 1247.79254,5.07096035 1213.53986,5.07096035 L1182.49731,5.07096035 C1182.49731,5.07096035 1171.88102,4.34184479 1159.99588,9.73852022 C1146.02947,16.0854864 1147.46263,34.4216751 1147.46263,34.4216751" id="FMS" fill="#82B92E"></path>
+            </g>
+            <g id="Group" transform="translate(382, 0)">
+                <path d="M19,243.998431 C19,368.236168 119.511284,468.960986 243.501566,468.960986 C367.493414,468.960986 468,368.236168 468,243.998431 C468,119.762262 367.493414,19.0390144 243.501566,19.0390144 C119.511284,19.0390144 19,119.762262 19,243.998431" id="Fill-15" fill="#FFFFFF"></path>
+                <path d="M374.01683,346.333809 C359.479833,358.746887 340.328189,369.408618 319.705754,374.922929 C296.599596,381.136523 270.647504,382.831425 245.941977,379.568621 C199.353338,373.439694 157.51733,344.066623 129.363755,316.527997 C132.576603,308.907995 133.504863,306.153192 136.807087,298.628831 C142.349993,304.403413 152.17356,312.073589 156.538893,315.093367 C186.765374,336.109522 226.277595,354.242305 278.60671,351.211551 C305.106037,349.759674 329.70337,340.584313 347.14275,326.581383 C364.023919,313.055095 378.17205,293.611546 377.856881,266.582488 C377.524463,237.965146 363.457868,214.606547 348.176067,198.977702 C342.909129,193.601367 337.239214,187.858143 331.514419,183.620105 C322.430951,176.918893 312.365911,171.729139 302.213063,166.815335 C291.914389,161.763555 281.327203,156.671011 269.038728,154.038504 C289.291113,141.145648 343.735469,125.344334 350.165868,129.044582 C354.173695,131.327447 358.52962,134.988498 361.8977,137.707239 C373.003898,146.619193 382.523271,159.157703 390.633006,170.775854 C402.291142,187.536724 412.131957,206.945779 415.732102,228.781946 C424.443952,282.708357 402.377382,322.19753 374.01683,346.333809 M49.1272432,256.670214 L49.1272432,256.60593 C73.955074,217.478943 102.668427,182.056907 136.70987,152.001799 C160.200191,131.228669 187.848867,112.674121 218.489302,99.2168202 C223.624526,96.8931899 228.623334,94.0411767 234.169377,92.2365218 C239.640155,90.4350028 245.380631,88.6272121 251.266931,86.6971251 C273.643966,79.3185796 304.472561,75.5775662 329.193768,78.340209 C347.675872,80.4333578 366.073304,85.7485446 378.360211,95.3002018 C382.507591,98.4924497 387.492287,101.984167 390.182988,105.808279 C391.724339,108.01902 393.892894,113.127244 392.672984,116.172109 C391.144176,119.844135 385.513461,120.207888 380.858047,120.096567 C364.992947,119.798666 350.426157,118.103764 335.073796,119.980543 C313.269084,122.653815 295.247973,128.740409 279.685499,135.281695 C246.799677,148.947527 218.578678,171.501793 196.33022,194.248911 C173.899872,217.138708 153.166109,245.975556 136.68635,275.580676 C118.304598,308.533267 104.448116,343.293647 92.9797091,379.767745 C66.7171514,345.509093 50.4616176,303.105191 49.1272432,256.670214 M243.999216,0 C109.235243,0 0,109.220033 0,243.998432 C0,378.756448 109.235243,488 243.999216,488 C378.771029,488 488,378.756448 488,243.998432 C488,109.220033 378.771029,0 243.999216,0" id="Fill-694" fill="#82B92E"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/images/help@header.svg b/pandora_console/images/help@header.svg
new file mode 100644
index 0000000000..e561a7c09e
--- /dev/null
+++ b/pandora_console/images/help@header.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>help_pandora</title>
+    <g id="help_pandora" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M10,0 C15.4050388,0 20,1.5951272 20,5.39448104 L20,14.605519 C20,18.4048728 15.4050388,20 10,20 C4.59496118,20 0,18.4048728 0,14.605519 L0,5.39448104 C0,1.5951272 4.59496118,0 10,0 Z M9.79831933,13.1716621 C8.99159664,13.1716621 8.35294118,13.8092643 8.35294118,14.5940054 C8.35294118,15.3623978 8.99159664,16 9.79831933,16 C10.605042,16 11.2605042,15.3623978 11.2605042,14.5940054 C11.2605042,13.8092643 10.605042,13.1716621 9.79831933,13.1716621 Z M9.91596639,4 C7.46218487,4 6,5.61852861 6,7.53133515 C6,7.74386921 6.01680672,7.98910082 6.06722689,8.21798365 L8.42016807,8.29972752 C8.40336134,8.23433243 8.3697479,8.07084469 8.3697479,7.69482289 C8.3697479,6.92643052 8.94117647,6.15803815 9.91596639,6.15803815 C10.9243697,6.15803815 11.4117647,6.77929155 11.4117647,7.41689373 C11.4117647,7.84196185 11.2605042,8.23433243 10.8067227,8.5613079 L9.94957983,9.18256131 C8.99159664,9.88555858 8.67226891,10.719346 8.67226891,11.4877384 C8.67226891,11.7493188 8.68907563,11.9782016 8.7394958,12.2070845 L10.7394958,12.2070845 C10.7394958,11.4713896 11.1428571,11.0463215 11.7310924,10.6212534 L12.3697479,10.1634877 C13.3781513,9.42779292 14,8.52861035 14,7.22070845 C14,5.58583106 12.6386555,4 9.91596639,4 Z" id="Mask" fill="#3F3F3F"></path>
+        <g id="?" transform="translate(6, 4)"></g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php
index 3eb093ab17..f6d3767708 100644
--- a/pandora_console/include/class/ConsoleSupervisor.php
+++ b/pandora_console/include/class/ConsoleSupervisor.php
@@ -211,6 +211,12 @@ class ConsoleSupervisor
 
         $this->checkUpdateManagerRegistration();
 
+        /*
+         * Check if has API access.
+         *  NOTIF.API.ACCESS
+         */
+        $this->checkApiAccess();
+
         /*
          * Check if there're new messages in UM.
          *  NOTIF.UPDATEMANAGER.MESSAGES
@@ -436,6 +442,12 @@ class ConsoleSupervisor
 
         $this->checkUpdateManagerRegistration();
 
+        /*
+         * Check if has API access.
+         *  NOTIF.API.ACCESS
+         */
+        $this->checkApiAccess();
+
         /*
          * Check if event storm protection is activated.
          *  NOTIF.MISC.EVENTSTORMPROTECTION
@@ -500,6 +512,12 @@ class ConsoleSupervisor
 
         $this->checkUpdateManagerRegistration();
 
+        /*
+         * Check if has API access.
+         *  NOTIF.API.ACCESS
+         */
+        $this->checkApiAccess();
+
         /*
          * Check if there're new messages in UM.
          *  NOTIF.UPDATEMANAGER.MESSAGES
@@ -867,6 +885,7 @@ class ConsoleSupervisor
             case 'NOTIF.METACONSOLE.DB_CONNECTION':
             case 'NOTIF.DOWNTIME':
             case 'NOTIF.UPDATEMANAGER.REGISTRATION':
+            case 'NOTIF.API.ACCESS':
             case 'NOTIF.MISC.EVENTSTORMPROTECTION':
             case 'NOTIF.MISC.DEVELOPBYPASS':
             case 'NOTIF.MISC.FONTPATH':
@@ -2369,6 +2388,30 @@ class ConsoleSupervisor
     }
 
 
+    /**
+     * Check if has access to the API
+     *
+     * @return void
+     */
+    public function checkApiAccess()
+    {
+        global $config;
+        include_once $config['homedir'].'/include/functions_update_manager.php';
+
+        if (update_manager_verify_api() === false) {
+            $this->notify(
+                [
+                    'type'    => 'NOTIF.API.ACCESS',
+                    'title'   => __('Cannot access the Pandora FMS API '),
+                    'message' => __('Please check the configuration, some components may fail due to this misconfiguration.'),
+                ]
+            );
+        } else {
+            $this->cleanNotifications('NOTIF.API.ACCESS');
+        }
+    }
+
+
     /**
      * Check if user 'admin' is enabled and using default password.
      *
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 9ca7663ba3..ae37cb616a 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -1744,8 +1744,8 @@ function html_print_select_multiple_modules_filtered(array $data):string
         [
             'label'       => __('Agents'),
             'label_class' => 'font-title-font',
-            'type'        => 'select',
-            'fields'      => $agents,
+            'type'        => 'select_from_sql',
+            'sql'         => 'SELECT `id_agente`,`nombre` FROM tagente',
             'name'        => 'filtered-module-agents-'.$uniqId,
             'selected'    => explode(',', $data['mAgents']),
             'return'      => true,
@@ -1925,8 +1925,7 @@ function html_print_extended_select_for_unit(
     $select_style=false,
     $unique_name=true,
     $disabled=false,
-    $no_change=0,
-    $class='w100p'
+    $no_change=0
 ) {
     global $config;
 
@@ -1958,7 +1957,7 @@ function html_print_extended_select_for_unit(
 
     ob_start();
 
-    echo '<div id="'.$uniq_name.'_default" class="'.$class.' inline_line">';
+    echo '<div id="'.$uniq_name.'_default" class="w100p inline_line">';
         html_print_select(
             $fields,
             $uniq_name.'_select',
@@ -3966,14 +3965,6 @@ function html_print_table(&$table, $return=false)
         }
     }
 
-    if (isset($table->tdid)) {
-        foreach ($table->tdid as $keyrow => $tid) {
-            foreach ($tid as $key => $id) {
-                $tdid[$keyrow][$key] = $id;
-            }
-        }
-    }
-
     if (isset($table->cellstyle)) {
         foreach ($table->cellstyle as $keyrow => $cstyle) {
             foreach ($cstyle as $key => $cst) {
@@ -4157,10 +4148,6 @@ function html_print_table(&$table, $return=false)
                     $colspan[$keyrow][$key] = '';
                 }
 
-                if (!isset($tdid[$keyrow][$key])) {
-                    $tdid[$keyrow][$key] = '';
-                }
-
                 if (!isset($rowspan[$keyrow][$key])) {
                     $rowspan[$keyrow][$key] = '';
                 }
@@ -4181,16 +4168,10 @@ function html_print_table(&$table, $return=false)
                     $style[$key] = '';
                 }
 
-                if ($tdid[$keyrow][$key] !== '') {
-                    $tid = $tdid[$keyrow][$key];
-                } else {
-                    $tid = $tableid.'-'.$keyrow.'-'.$key;
-                }
-
                 if ($class === 'datos5' && $key === 1) {
-                    $output .= '<td id="'.$tid.'" style="'.$cellstyle[$keyrow][$key].$style[$key].$valign[$key].$align[$key].$size[$key].$wrap[$key].$colspan[$keyrow][$key].' '.$rowspan[$keyrow][$key].' class="'.$class.' '.$cellclass[$keyrow][$key].'">'.$item.'</td>'."\n";
+                    $output .= '<td id="'.$tableid.'-'.$keyrow.'-'.$key.'" style="'.$cellstyle[$keyrow][$key].$style[$key].$valign[$key].$align[$key].$size[$key].$wrap[$key].$colspan[$keyrow][$key].' '.$rowspan[$keyrow][$key].' class="'.$class.' '.$cellclass[$keyrow][$key].'">'.$item.'</td>'."\n";
                 } else {
-                    $output .= '<td id="'.$tid.'" style="'.$cellstyle[$keyrow][$key].$style[$key].$valign[$key].$align[$key].$size[$key].$wrap[$key].'" '.$colspan[$keyrow][$key].' '.$rowspan[$keyrow][$key].' class="'.$class.' '.$cellclass[$keyrow][$key].'">'.$item.'</td>'."\n";
+                    $output .= '<td id="'.$tableid.'-'.$keyrow.'-'.$key.'" style="'.$cellstyle[$keyrow][$key].$style[$key].$valign[$key].$align[$key].$size[$key].$wrap[$key].'" '.$colspan[$keyrow][$key].' '.$rowspan[$keyrow][$key].' class="'.$class.' '.$cellclass[$keyrow][$key].'">'.$item.'</td>'."\n";
                 }
             }
 
diff --git a/pandora_console/include/functions_notifications.php b/pandora_console/include/functions_notifications.php
index df458f3ad0..b75e427129 100644
--- a/pandora_console/include/functions_notifications.php
+++ b/pandora_console/include/functions_notifications.php
@@ -146,6 +146,7 @@ function notifications_get_subtypes(?string $source=null)
             'NOTIF.METACONSOLE.DB_CONNECTION',
             'NOTIF.DOWNTIME',
             'NOTIF.UPDATEMANAGER.REGISTRATION',
+            'NOTIF.API.ACCESS',
             'NOTIF.MISC.EVENTSTORMPROTECTION',
             'NOTIF.MISC.DEVELOPBYPASS',
             'NOTIF.MISC.FONTPATH',
diff --git a/pandora_console/include/functions_update_manager.php b/pandora_console/include/functions_update_manager.php
index d564d363c5..f78b94d188 100755
--- a/pandora_console/include/functions_update_manager.php
+++ b/pandora_console/include/functions_update_manager.php
@@ -55,6 +55,18 @@ function update_manager_verify_registration()
 }
 
 
+/**
+ * Verifies api state.
+ *
+ * @return boolean Status.
+ */
+function update_manager_verify_api()
+{
+    global $config;
+    return (isset($config['has_api_access']) === true && $config['has_api_access'] == '1');
+}
+
+
 /**
  * Retrieves current update from DB.
  *
diff --git a/pandora_console/include/javascript/connection_check.js b/pandora_console/include/javascript/connection_check.js
index f791a36232..d1fde9eae9 100644
--- a/pandora_console/include/javascript/connection_check.js
+++ b/pandora_console/include/javascript/connection_check.js
@@ -86,8 +86,8 @@ function showConnectionMessage(conn = true, msg = "") {
       .closest(".ui-dialog-content")
       .dialog("close");
   } else {
-    data.title = "Connection with server has been lost";
-    data.text = "Connection status: " + msg;
+    data.title = get_php_value("title_conexion_interval");
+    data.text = get_php_value("status_conexion_interval") + msg;
 
     infoMessage(data, "message_dialog_connection");
   }
diff --git a/pandora_console/include/javascript/pandora_dashboards.js b/pandora_console/include/javascript/pandora_dashboards.js
index 5b36832b29..b6a2ec3b82 100644
--- a/pandora_console/include/javascript/pandora_dashboards.js
+++ b/pandora_console/include/javascript/pandora_dashboards.js
@@ -217,6 +217,8 @@ function initialiceLayout(data) {
           success: function(widgetData) {
             // Remove spinner.
             removeSpinner(element);
+            widgetData = widgetData.replace("<script", "&lt;script");
+            widgetData = widgetData.replace("</script", "&lt;/script");
             $("#widget-" + id + " .content-widget").append(widgetData);
 
             $("#button-add-widget-" + id).click(function() {
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index ca8529df37..7f8cec71b4 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -1535,7 +1535,45 @@ div#head {
 input.datos {
   background-color: #f5f5f5;
 }
-
+#modal_help {
+  position: absolute;
+  top: -2px;
+  right: 32px;
+  background: white;
+  display: flex;
+  min-width: 160px;
+  flex-direction: column;
+  filter: drop-shadow(1px 2px 2px #0000005e);
+  padding: 10px 0px;
+}
+#modal-help-content {
+  position: relative;
+  cursor: pointer;
+}
+#modal_help a {
+  margin: 3px 0px;
+  padding: 0px 15px;
+}
+#modal_help a:hover {
+  color: var(--primary-color);
+}
+#modal_help .separator {
+  width: 100%;
+  opacity: 0.4;
+}
+#modal_help::before {
+  content: "";
+  border: 8px solid #0000;
+  border-bottom: 8px solid white;
+  left: auto;
+  right: -16px;
+  top: 5px;
+  position: absolute;
+  transform: rotate(90deg);
+}
+#modal_help.invisible {
+  display: none;
+}
 /*
  * ---------------------------------------------------------------------
  * - REPORTS 														-
@@ -9412,7 +9450,8 @@ div.stat-win-spinner img {
   .select2-selection--multiple
   .select2-selection__rendered {
   padding: 5px 10px 10px !important;
-  max-height: 120px;
+  min-height: 100px;
+  max-height: 250px;
   overflow: auto !important;
 }
 
@@ -10792,10 +10831,6 @@ button.ui-button.ui-widget.submit-cancel:active {
   border-color: #96a2bf;
 }
 
-.cursor-default {
-  cursor: default;
-}
-
 .hasColorPicker {
   z-index: 10;
 }
@@ -12288,14 +12323,6 @@ div.parent_graph > p.legend_background > table > tbody > tr {
   margin: 0px !important;
 }
 
-form.max_floating_element_size > ul#ul_tree_azure {
-  background-color: #fff;
-  border-spacing: 0px;
-  border-radius: 6px;
-  margin-bottom: 20px;
-  border: 1px solid #e2e2e2;
-}
-
 #grid_img {
   position: absolute;
   margin-top: -2px;
@@ -12384,6 +12411,10 @@ tr[id^="network_component-plugin-snmp-fields-dynamicMacroRow-"] input {
   vertical-align: middle;
 }
 
+.label_agent_service > label {
+  margin-top: 15px;
+}
+
 .animation-blink {
   -webkit-animation: glowing 1500ms infinite;
   -moz-animation: glowing 1500ms infinite;
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index c8d4441465..725a1c67d0 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -1851,3 +1851,10 @@ a.pandora_pagination,
   color: #fff !important;
   background-color: #333 !important;
 }
+
+#modal_help {
+  background: #222222;
+}
+#modal_help::before {
+  border-bottom: 8px solid #222222;
+}
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 787b2c2437..fce3421ffe 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -1516,10 +1516,12 @@ echo html_print_div(
 
 // Connection lost alert.
 set_js_value('check_conexion_interval', $config['check_conexion_interval']);
+set_js_value('title_conexion_interval', __('Connection with console has been lost'));
+set_js_value('status_conexion_interval', __('Connection status: '));
 ui_require_javascript_file('connection_check');
 set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false));
-$conn_title = __('Connection with server has been lost');
-$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
+$conn_title = __('Connection with console has been lost');
+$conn_text = __('Connection to the console has been lost. Please check your internet connection.');
 ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/fail@svg.svg');
 
 if ($config['pure'] == 0) {
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index ac494046b5..a1b852bf0f 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -89,8 +89,8 @@ $label = db_get_value(
 
 ui_require_css_file('register', 'include/styles/', true);
 // Connection lost alert.
-$conn_title = __('Connection with server has been lost');
-$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
+$conn_title = __('Connection with console has been lost');
+$conn_text = __('Connection to the console has been lost. Please check your internet connection.');
 ui_require_javascript_file('connection_check');
 set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false));
 ui_print_message_dialog(
diff --git a/pandora_console/operation/gis_maps/public_console.php b/pandora_console/operation/gis_maps/public_console.php
index 0f6883984a..e674df41f3 100755
--- a/pandora_console/operation/gis_maps/public_console.php
+++ b/pandora_console/operation/gis_maps/public_console.php
@@ -274,8 +274,8 @@ if ($layers != false) {
 
     // Connection lost alert.
     ui_require_css_file('register', 'include/styles/', true);
-    $conn_title = __('Connection with server has been lost');
-    $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
+    $conn_title = __('Connection with console has been lost');
+    $conn_text = __('Connection to the console has been lost. Please check your internet connection.');
     ui_require_javascript_file('connection_check');
     set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false));
     ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/fail@svg.svg');
diff --git a/pandora_console/operation/visual_console/legacy_public_view.php b/pandora_console/operation/visual_console/legacy_public_view.php
index 9157b612d9..04b8e508c1 100644
--- a/pandora_console/operation/visual_console/legacy_public_view.php
+++ b/pandora_console/operation/visual_console/legacy_public_view.php
@@ -54,8 +54,8 @@ echo '<link rel="stylesheet" href="'.$url_css_modal.'?v='.$config['current_packa
 // Connection lost alert.
 ui_require_javascript_file('connection_check', 'include/javascript/', true);
 set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false));
-$conn_title = __('Connection with server has been lost');
-$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
+$conn_title = __('Connection with console has been lost');
+$conn_text = __('Connection to the console has been lost. Please check your internet connection.');
 ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/fail@svg.svg');
 
 require_once 'include/functions_visual_map.php';
diff --git a/pandora_console/operation/visual_console/public_view.php b/pandora_console/operation/visual_console/public_view.php
index 02bf929f58..6fdac1b949 100644
--- a/pandora_console/operation/visual_console/public_view.php
+++ b/pandora_console/operation/visual_console/public_view.php
@@ -35,8 +35,8 @@ ui_require_css_file('register', 'include/styles/', true);
 // Connection lost alert.
 ui_require_javascript_file('connection_check', 'include/javascript/', true);
 set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false));
-$conn_title = __('Connection with server has been lost');
-$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
+$conn_title = __('Connection with console has been lost');
+$conn_text = __('Connection to the console has been lost. Please check your internet connection.');
 ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/fail@svg.svg');
 
 echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'."\n";
diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index 6152136a77..b161bd57bb 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -733,15 +733,29 @@ sub main() {
 	my $command = $Config{'plugin_exec'}.' 30 curl --cookie-jar /tmp/cron-session-cookies '.$curl_execution.' 2>/dev/null';
 	my $exe_testing_api = `$command`;
 	my @res_testing_api = split(',', $exe_testing_api);
+	my $has_api_access = undef;
+
 	if ( $res_testing_api[0] ne 'OK' ) {
 		logger(\%Config, "Warning! The server does not have access to the API, this can trigger problems in the generation of reports and graphs.", 1);
-		pandora_event (\%Config, "Server does not have access to the API", 0, 0, 0, 0, 0, 'system', 0, $DBH);
+		pandora_event (\%Config, "The server " . $Config{'servername'} ." cannot access the Pandora FMS API through the supplied credentials. Please check the configuration, some components may fail due to this misconfiguration. Look in the manual for the configuration tokens related to console_api_pass.", 0, 0, 0, 0, 0, 'system', 0, $DBH);
+		$has_api_access = "0";
 	} else {
 		# Test successful.
 		pandora_set_tconfig_token($DBH, 'internal_user_pass',
 			pandora_input_password(\%Config, $Config{"console_pass"})
 		);
 		pandora_set_tconfig_token($DBH, 'internal_user', $Config{"console_user"});
+		$has_api_access = "1";
+	}
+
+	my $token = "has_api_access";
+	my $prev_access = pandora_get_config_value($DBH, $token);
+
+	if(defined($prev_access) && $prev_access ne "") {
+		db_update ($DBH, 'UPDATE tconfig SET value = ? WHERE token = ?', $has_api_access, $token);
+	}
+	else {
+		db_insert ($DBH, 'id_config', 'INSERT INTO tconfig (token, value) VALUES (?, ?)', $token, $has_api_access);
 	}
 
 	# Generate 'going up' events
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index c7208f5876..89ae55f6c1 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -1399,6 +1399,7 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
 		_timestamp_ => (defined($timestamp)) ? $timestamp : strftime ("%Y-%m-%d %H:%M:%S", localtime()),
 		_timezone_ => strftime ("%Z", localtime()),
 		_data_ => $data,
+		_dataunit_ => (defined ($module)) ? $module->{'unit'} : '',
 		_prevdata_ => undef,
 		_homeurl_ => $pa_config->{'public_url'},
 		_alert_name_ => $alert->{'name'},
@@ -4905,6 +4906,9 @@ sub on_demand_macro($$$$$$;$) {
 		my $field_number = $1;
 		my $field_value = get_db_value($dbh, 'SELECT description FROM tagent_custom_data WHERE id_field=? AND id_agent=?', $field_number, $agent_id);
 		return (defined($field_value)) ? $field_value : '';	
+	} elsif ($macro eq '_dataunit_'){
+		return '' unless defined ($module);
+		my $field_value = get_db_value($dbh, 'SELECT unit FROM tagente_modulo where id_agente_modulo = ? limit 1', $module->{'id_agente_modulo'});	
 	} elsif ($macro eq '_prevdata_') {
 		return '' unless defined ($module);
 		if ($module->{'id_tipo_modulo'} eq 3){