diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 301231b1e4c..36c64a826a6 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -252,6 +252,7 @@ foreach ($phparray as $key => $value) {
 		if (!is_array($keyvalue)) {
 			$keytoshow = $keyparam;
 			$valtoshow = $keyvalue;
+
 			// Hide value of session cookies
 			if (in_array($keyparam, array('HTTP_COOKIE', 'Cookie', "\$_SERVER['HTTP_COOKIE']", 'Authorization'))) {
 				$valtoshow = '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
@@ -260,6 +261,10 @@ foreach ($phparray as $key => $value) {
 				$keytoshow = $keyparam;
 				$valtoshow = '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
 			}
+			if (preg_match('/'.preg_quote('$_SERVER[\'PHP_AUTH_PW', '/').'/i', $keyparam)) {
+				$keytoshow = $keyparam;
+				$valtoshow = '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
+			}
 
 			print '<tr class="oddeven">';
 			print '<td>'.$keytoshow.'</td>';
diff --git a/htdocs/debugbar/class/DataCollector/DolRequestDataCollector.php b/htdocs/debugbar/class/DataCollector/DolRequestDataCollector.php
index a74669e5238..d7e8f9a858a 100644
--- a/htdocs/debugbar/class/DataCollector/DolRequestDataCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolRequestDataCollector.php
@@ -51,7 +51,13 @@ class DolRequestDataCollector extends RequestDataCollector
 					}
 					//var_dump($arrayofvalues);
 				}
-
+				if ($var == '_SERVER') {
+					foreach ($arrayofvalues as $key => $val) {
+						if (preg_match('/^PHP_AUTH_PW/', $key)) {
+							$arrayofvalues[$key] = '*****hidden*****';
+						}
+					}
+				}
 				$data["$".$var] = $this->getDataFormatter()->formatVar($arrayofvalues);
 			}
 		}