diff --git a/pandora_console/godmode/agentes/module_manager_editor_network.php b/pandora_console/godmode/agentes/module_manager_editor_network.php
index 464fff7c67..fb2e968ac6 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_network.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_network.php
@@ -390,14 +390,16 @@ $data[1] = html_print_input_text(
 $data[2] = __('Auth password').ui_print_help_tip(__('The pass length must be eight character minimum.'), true);
 $data[3] = html_print_input_password(
     'snmp3_auth_pass',
-    '',
+    $snmp3_auth_pass,
     '',
     15,
     60,
     true,
     $disabledBecauseInPolicy,
     false,
-    $largeclassdisabledBecauseInPolicy
+    $largeclassdisabledBecauseInPolicy,
+    'off',
+    true
 );
 $data[3] .= html_print_input_hidden_extended('active_snmp_v3', 0, 'active_snmp_v3_mmen', true);
 if ($snmp_version != 3) {
@@ -412,14 +414,16 @@ $data[1] = html_print_select(['DES' => __('DES'), 'AES' => __('AES')], 'snmp3_pr
 $data[2] = __('Privacy pass').ui_print_help_tip(__('The pass length must be eight character minimum.'), true);
 $data[3] = html_print_input_password(
     'snmp3_privacy_pass',
-    '',
+    $snmp3_privacy_pass,
     '',
     15,
     60,
     true,
     $disabledBecauseInPolicy,
     false,
-    $largeclassdisabledBecauseInPolicy
+    $largeclassdisabledBecauseInPolicy,
+    'off',
+    true
 );
 
 if ($snmp_version != 3) {
@@ -731,12 +735,6 @@ $(document).ready (function () {
             $("#text-custom_ip_target").hide();
         }
     });
-
-    // Add input password values with js to hide it in browser inspector.
-    $('#password-snmp3_auth_pass').val('<?php echo $snmp3_auth_pass; ?>');
-    $('#password-snmp3_privacy_pass').val('<?php echo $snmp3_privacy_pass; ?>');
-
-    observerInputPassword();
 });
 
 
diff --git a/pandora_console/godmode/agentes/module_manager_editor_plugin.php b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
index 87c18ceefe..7e66f078a9 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_plugin.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
@@ -103,7 +103,19 @@ if (!empty($macros)) {
         }
 
         if ($m_hide) {
-            $data[1] = html_print_input_password($m['macro'], '', '', 100, 1024, true);
+            $data[1] = html_print_input_password(
+                $m['macro'],
+                io_output_password($m['value']),
+                '',
+                100,
+                1024,
+                true,
+                false,
+                false,
+                '',
+                'off',
+                true
+            );
             array_push($password_fields, $m);
         } else {
             $data[1] = html_print_input_text(
diff --git a/pandora_console/godmode/agentes/module_manager_editor_wmi.php b/pandora_console/godmode/agentes/module_manager_editor_wmi.php
index 3b3f539f08..5af47b915b 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_wmi.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_wmi.php
@@ -148,7 +148,7 @@ $data[2] = html_print_label_input_block(
     __('Password'),
     html_print_input_password(
         'plugin_pass',
-        '',
+        $plugin_pass,
         '',
         15,
         60,