diff --git a/powerwall.sh b/powerwall.sh
index 63669060..c6adab7c 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -1553,6 +1553,21 @@ HOSTMGMT(){
 	done
 	([ "${HOST}" == "" ] || ([ "${POWER}" == "" ] && [ "${ESXI}" == "" ])) && echo -e "Invalid command arguments\n" && exit 1
 	
+	if [ "${PW_iDRACHOST_SHORTNAMES[${HOST}]}" != "" ]; then
+		tmp=${PW_iDRACHOST_SHORTNAMES[${HOST}]}
+		ESXIHOST=${PW_HOST_ADDRESSES[${tmp}]}
+	elif [ "${PW_ESXI_HOST_NAMES[${HOST}]}" != "" ]; then
+		ESXIHOST=${HOST}
+	elif [ "${PW_HOST_IDRACS[iDS-vMS-Host${HOST}]}" != "" ]; then
+		ESXIHOST=${PW_HOST_ADDRESSES[iDS-vMS-Host${HOST}]}
+	elif [ "${PW_HOST_IDRACS[${HOST}]}" != "" ]; then
+		tmp=${PW_HOST_IDRACS[${HOST}]}
+		ESXIHOST=${PW_HOST_ADDRESSES[${tmp}]}
+	else
+		ESXIHOST=''
+	fi
+	[ "${ESXIHOST}" == "" ] && echo -e "Invalid host\n" && exit 1
+	
 	if [ "${MODE}" == "esxi" ]; then
 		([ "${ESXI}" == "maint" ] || [ "${ESXI}" == "maintenance" ] || [ "${ESXI}" == "mm" ]) && SHUTDOWN_SERVER ${HOST} maintenance || SHUTDOWN_SERVER ${HOST}