diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index b8c0c6834b..1a2426aeb8 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -2042,9 +2042,17 @@ function events_page_custom_fields ($event) {
 		$data = array();
 		$data[0] = $field['name'];
 		
-		$data[1] = empty($fields_data[$field['id_field']])
-			? '<i>'.__('N/A').'</i>'
-			: ui_bbcode_to_html($fields_data[$field['id_field']]);
+		if(empty($fields_data[$field['id_field']])){
+			$data[1] = '<i>'.__('N/A').'</i>';
+		}
+		else{
+			if($field['is_password_type']){
+				$data[1] = '&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;';
+			}
+			else{
+				$data[1] = ui_bbcode_to_html($fields_data[$field['id_field']]);
+			}
+		}
 		
 		$field['id_field'];
 		
diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php
index 9da64a6dbe..e30b9465ae 100755
--- a/pandora_console/include/functions_treeview.php
+++ b/pandora_console/include/functions_treeview.php
@@ -695,7 +695,13 @@ function treeview_printTable($id_agente, $server_data = array(), $no_head = fals
 			if (!empty($custom_value)) {
 				$row = array();
 				$row['title'] = $field['name'] . ui_print_help_tip (__('Custom field'), true);
-				$row['data'] = ui_bbcode_to_html($custom_value);
+				if($field['is_password_type']){
+						$row['data'] = '&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;';
+				}
+				else{
+						$row['data'] = ui_bbcode_to_html($custom_value);
+				}
+				
 				$table->data['custom_field_'.$field['id_field']] = $row;
 			}
 		}