diff --git a/powerwall.sh b/powerwall.sh
index 21f5997f..f82c9e59 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -1900,8 +1900,10 @@ HOSTMGMT(){
 	fi
 	DIVIDER . yellow 75
 	if [ "${HOST^^}" == "ALL" ] || [ "${HOST^^}" == "MAINSITE" ] || [ "${HOST^^}" == "OFFSITE" ] || [ "${HOST^^}" == "MAIN" ] || [ "${HOST^^}" == "SYS" ]; then
-		echo -e "${idsCL[LightCyan]}  - Hostname [hostip]${idsCL[Default]}"
-		echo -e "${idsCL[LightCyan]}  - Hostname [hostip]${idsCL[Default]}"
+		var=PW_${HOST^^}HOSTS[@]
+		for vhost in "${!var}"; do
+			echo -e "${idsCL[LightCyan]}  - ${PW_ESXI_HOST_NAMES[${vhost}]} [${vhost}]${idsCL[Default]}"
+		fi
 		DIVIDER . yellow 75
 	fi
 	echo