diff --git a/pandora_console/extras/mr/28.sql b/pandora_console/extras/mr/28.sql
index e4dfe8fe9b..70e342821c 100644
--- a/pandora_console/extras/mr/28.sql
+++ b/pandora_console/extras/mr/28.sql
@@ -2,4 +2,8 @@ START TRANSACTION;
 
 DELETE FROM `tevent_response` WHERE `name` LIKE 'Create Integria IMS incident from event';
 
+ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_login_user` VARCHAR(60);
+ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_login_pass` VARCHAR(45);
+
+
 COMMIT;
diff --git a/pandora_console/godmode/setup/setup_ehorus.php b/pandora_console/godmode/setup/setup_ehorus.php
index b272cc2c56..e0cf119c44 100644
--- a/pandora_console/godmode/setup/setup_ehorus.php
+++ b/pandora_console/godmode/setup/setup_ehorus.php
@@ -52,7 +52,7 @@ $table_enable->style['name'] = 'font-weight: bold';
 
 // Enable eHorus.
 $row = [];
-$row['name'] = ('Enable eHorus');
+$row['name'] = __('Enable eHorus');
 $row['control'] = html_print_checkbox_switch('ehorus_enabled', 1, $config['ehorus_enabled'], true);
 $table_enable->data['ehorus_enabled'] = $row;
 
@@ -66,12 +66,6 @@ $table_remote->class = 'databox filters';
 $table_remote->size['name'] = '30%';
 $table_remote->style['name'] = 'font-weight: bold';
 
-
-// Enable eHorus user configuration.
-$row = [];
-$row['name'] = ('Enable eHorus user configuration');
-$row['control'] = html_print_checkbox_switch('ehorus_user_login', 1, $config['ehorus_user_login'], true);
-$table_remote->data['ehorus_user_login'] = $row;
 // User.
 $row = [];
 $row['name'] = __('User');
@@ -114,6 +108,7 @@ $row['control'] .= '<span id="test-ehorus-success" style="display:none;">&nbsp;'
 $row['control'] .= '<span id="test-ehorus-failure" style="display:none;">&nbsp;'.html_print_image('images/status_sets/default/severity_critical.png', true).'</span>';
 $row['control'] .= '&nbsp;<span id="test-ehorus-message" style="display:none;"></span>';
 $table_remote->data['ehorus_test'] = $row;
+
 // Print.
 echo '<div style="text-align: center; padding-bottom: 20px;">';
 echo '<a target="_blank" rel="noopener noreferrer" href="http://ehorus.com">';
@@ -144,62 +139,49 @@ if ($config['ehorus_enabled'] && !$custom_field_exists) {
     ui_print_error_message($error_message);
 }
 
-
-hd($_POST);
-echo '<form id="conf_ehorus" method="post">';
-
 // Form enable.
-echo '<div id="conf_enable">';
+echo '<form id="form_enable" method="post">';
 html_print_input_hidden('update_config', 1);
 html_print_table($table_enable);
-echo '</div>';
+echo '</form>';
 
 // Form remote.
-    echo '<div id="conf_remote">';
+if ($config['ehorus_enabled']) {
+    echo '<form id="form_remote" method="post">';
     echo '<fieldset>';
     echo '<legend>'.__('eHorus API').'</legend>';
     html_print_input_hidden('update_config', 1);
     html_print_table($table_remote);
-    echo '</div>';
-    echo '</fieldset>';
     echo '<div class="action-buttons" style="width: '.$table_remote->width.'">';
     html_print_submit_button(__('Update'), 'update_button', false, 'class="sub upd"');
     echo '</div>';
-
-
+    echo '</fieldset>';
     echo '</form>';
+}
 
 ?>
 
 <script type="text/javascript">
- $('#conf_enable').css('margin-bottom','20px');
+ $('input:checkbox[name="ehorus_enabled"]').attr('checked', false);
+ $('form#form_remote').hide();
+ $('form#form_enable').css('margin-bottom','20px');
     var showFields = function () {
-        $('#conf_remote').show();
+        $('form#form_remote').show();
     }
     var hideFields = function () {
-        $('#conf_remote').hide();
+        $('form#form_remote').hide();
     }
     var handleEnable = function (event) {
         var is_checked = $('input:checkbox[name="ehorus_enabled"]').is(':checked');
         if (event.target.value == '1' && is_checked) {
             showFields();
-            $('input:checkbox[name="ehorus_enabled"]').attr('checked', true);
+            $('input:checkbox[name="ehorus_enabled"]').attr('checked', false);
         }
         else {
             hideFields();
-            $('input:checkbox[name="ehorus_enabled"]').attr('checked', false);
+            $('input:checkbox[name="ehorus_enabled"]').attr('checked', true);
         };
     }
-
-    if($('input:checkbox[name="ehorus_enabled"]').is(':checked'))
-    {
-        showFields();
-    }else
-    {
-        hideFields();
-    }
-    
-    
     $('input:checkbox[name="ehorus_enabled"]').change(handleEnable);
     
     var handleTest = function (event) {
@@ -246,7 +228,6 @@ echo '</div>';
         hideFailureImage();
         hideMessage();
         showLoadingImage();
-
         $.ajax({
             url: 'https://' + host + ':' + port + '/login',
             type: 'POST',
diff --git a/pandora_console/operation/agentes/ehorus.php b/pandora_console/operation/agentes/ehorus.php
index 51fca3a801..aebf1ab0ef 100644
--- a/pandora_console/operation/agentes/ehorus.php
+++ b/pandora_console/operation/agentes/ehorus.php
@@ -58,6 +58,12 @@ $curl_timeout = $config['ehorus_req_timeout'];
 
 $base_url = 'https://'.$hostname.':'.$port;
 
+// If user login is enabled, fetch user and pass from user info
+if ($config['ehorus_user_login']) {
+    $user = $user_info['ehorus_user_login_user'];
+    $password = io_safe_output(io_output_password($user_info['ehorus_user_login_pass']));
+}
+
 // Get the login auth token
 $login_path = '/api/login';
 $body = [
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index 5578b9182f..b7e0662947 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -1260,38 +1260,49 @@ if (enterprise_installed() && $config['log_collector']) {
 
 // EHorus tab.
 if ($config['ehorus_enabled'] && !empty($config['ehorus_custom_field'])
-    && (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW') || is_user_admin($config['id_user']))
+    && (check_acl_one_of_groups(
+        $config['id_user'],
+        $all_groups,
+        '
+    '
+    ) || is_user_admin($config['id_user']))
 ) {
-    $ehorus_agent_id = agents_get_agent_custom_field($id_agente, $config['ehorus_custom_field']);
-    if (!empty($ehorus_agent_id)) {
-        $tab_url = 'index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=ehorus&id_agente='.$id_agente;
-        $ehorus_tab['text'] = '<a href="'.$tab_url.'" class="ehorus_tab">'.html_print_image('images/ehorus/ehorus.png', true, [ 'title' => __('eHorus')]).'</a>';
+    $user_info;
+    $user_info = users_get_user_by_id($config['id_user']);
+    if ($config['ehorus_user_login'] && !$user_info['ehorus_user_login_user'] && !$user_info['ehorus_user_login_pass']) {
+        // If ehorus user configuration is enabled, and no password provided, do nothing.
+    } else {
+        $ehorus_agent_id = agents_get_agent_custom_field($id_agente, $config['ehorus_custom_field']);
+        if (!empty($ehorus_agent_id)) {
+            $tab_url = 'index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=ehorus&id_agente='.$id_agente;
+            $ehorus_tab['text'] = '<a href="'.$tab_url.'" class="ehorus_tab">'.html_print_image('images/ehorus/ehorus.png', true, [ 'title' => __('eHorus')]).'</a>';
 
-        // Hidden subtab layer.
-        $ehorus_tab['sub_menu'] = '<ul class="mn subsubmenu" style="float:none;">';
-        $ehorus_tab['sub_menu'] .= '<a class="tab_terminal" href="'.$tab_url.'&client_tab=terminal">';
-        $ehorus_tab['sub_menu'] .= '<li class="nomn tab_godmode" style="text-align: center;">'.html_print_image('images/ehorus/terminal.png', true, [ 'title' => __('Terminal')]);
-        $ehorus_tab['sub_menu'] .= '</li>';
-        $ehorus_tab['sub_menu'] .= '</a>';
-        $ehorus_tab['sub_menu'] .= '<a class="tab_display" href="'.$tab_url.'&client_tab=display">';
-        $ehorus_tab['sub_menu'] .= '<li class="nomn tab_godmode" style="text-align: center;">'.html_print_image('images/ehorus/vnc.png', true, [ 'title' => __('Display')]);
-        $ehorus_tab['sub_menu'] .= '</li>';
-        $ehorus_tab['sub_menu'] .= '</a>';
-        $ehorus_tab['sub_menu'] .= '<a class="tab_processes" href="'.$tab_url.'&client_tab=processes">';
-        $ehorus_tab['sub_menu'] .= '<li class="nomn tab_godmode" style="text-align: center;">'.html_print_image('images/ehorus/processes.png', true, [ 'title' => __('Processes')]);
-        $ehorus_tab['sub_menu'] .= '</li>';
-        $ehorus_tab['sub_menu'] .= '</a>';
-        $ehorus_tab['sub_menu'] .= '<a class="tab_services" href="'.$tab_url.'&client_tab=services">';
-        $ehorus_tab['sub_menu'] .= '<li class="nomn tab_godmode" style="text-align: center;">'.html_print_image('images/ehorus/services.png', true, [ 'title' => __('Services')]);
-        $ehorus_tab['sub_menu'] .= '</li>';
-        $ehorus_tab['sub_menu'] .= '</a>';
-        $ehorus_tab['sub_menu'] .= '<a class="tab_files" href="'.$tab_url.'&client_tab=files">';
-        $ehorus_tab['sub_menu'] .= '<li class="nomn tab_godmode" style="text-align: center;">'.html_print_image('images/ehorus/files.png', true, [ 'title' => __('Files')]);
-        $ehorus_tab['sub_menu'] .= '</li>';
-        $ehorus_tab['sub_menu'] .= '</a>';
-        $ehorus_tab['sub_menu'] .= '</ul>';
+            // Hidden subtab layer.
+            $ehorus_tab['sub_menu'] = '<ul class="mn subsubmenu" style="float:none;">';
+            $ehorus_tab['sub_menu'] .= '<a class="tab_terminal" href="'.$tab_url.'&client_tab=terminal">';
+            $ehorus_tab['sub_menu'] .= '<li class="nomn tab_godmode" style="text-align: center;">'.html_print_image('images/ehorus/terminal.png', true, [ 'title' => __('Terminal')]);
+            $ehorus_tab['sub_menu'] .= '</li>';
+            $ehorus_tab['sub_menu'] .= '</a>';
+            $ehorus_tab['sub_menu'] .= '<a class="tab_display" href="'.$tab_url.'&client_tab=display">';
+            $ehorus_tab['sub_menu'] .= '<li class="nomn tab_godmode" style="text-align: center;">'.html_print_image('images/ehorus/vnc.png', true, [ 'title' => __('Display')]);
+            $ehorus_tab['sub_menu'] .= '</li>';
+            $ehorus_tab['sub_menu'] .= '</a>';
+            $ehorus_tab['sub_menu'] .= '<a class="tab_processes" href="'.$tab_url.'&client_tab=processes">';
+            $ehorus_tab['sub_menu'] .= '<li class="nomn tab_godmode" style="text-align: center;">'.html_print_image('images/ehorus/processes.png', true, [ 'title' => __('Processes')]);
+            $ehorus_tab['sub_menu'] .= '</li>';
+            $ehorus_tab['sub_menu'] .= '</a>';
+            $ehorus_tab['sub_menu'] .= '<a class="tab_services" href="'.$tab_url.'&client_tab=services">';
+            $ehorus_tab['sub_menu'] .= '<li class="nomn tab_godmode" style="text-align: center;">'.html_print_image('images/ehorus/services.png', true, [ 'title' => __('Services')]);
+            $ehorus_tab['sub_menu'] .= '</li>';
+            $ehorus_tab['sub_menu'] .= '</a>';
+            $ehorus_tab['sub_menu'] .= '<a class="tab_files" href="'.$tab_url.'&client_tab=files">';
+            $ehorus_tab['sub_menu'] .= '<li class="nomn tab_godmode" style="text-align: center;">'.html_print_image('images/ehorus/files.png', true, [ 'title' => __('Files')]);
+            $ehorus_tab['sub_menu'] .= '</li>';
+            $ehorus_tab['sub_menu'] .= '</a>';
+            $ehorus_tab['sub_menu'] .= '</ul>';
 
-        $ehorus_tab['active'] = $tab == 'ehorus';
+            $ehorus_tab['active'] = $tab == 'ehorus';
+        }
     }
 }