diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index dba941323c..3b74ef3529 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -886,7 +886,11 @@ if ($update_module || $create_module) {
 		$macros = json_decode(base64_decode($macros), true);
 		
 		foreach($macros as $k => $m) {
-			$macros[$k]['value'] = get_parameter($m['macro'], '');
+			if ($m['hide'] == "1") {
+				$macros[$k]['value'] = io_input_password(get_parameter($m['macro'], ''));
+			} else {
+				$macros[$k]['value'] = get_parameter($m['macro'], '');
+			}
 		}
 		
 		$macros = io_json_mb_encode($macros);
diff --git a/pandora_console/godmode/agentes/module_manager_editor_plugin.php b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
index d603a5c9c5..f2326baa42 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_plugin.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
@@ -90,7 +90,7 @@ if (!empty($macros)) {
 			$m_hide = $m['hide'];
 		
 		if ($m_hide) {
-			$data[1] = html_print_input_password($m['macro'], $m['value'], '', 100, 255, true);
+			$data[1] = html_print_input_password($m['macro'], io_output_password($m['value']), '', 100, 255, true);
 		}
 		else {
 			$data[1] = html_print_input_text($m['macro'], $m['value'], '', 100, 255, true);