diff --git a/powerwall.sh b/powerwall.sh
index 4ac59fb3..850cc752 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -1638,6 +1638,11 @@ HOSTMGMT(){
 			ESXIHOST=''
 		fi
 		[ "${ESXIHOST}" == "" ] && echo -e "Invalid host\n" && exit 1
+		if [ "${PW_ESXI_HOST_NAMES[${ESXIHOST}]}" != "" ]; then
+			tmp=${PW_ESXI_HOST_NAMES[${ESXIHOST}]}
+			idracip=${PW_HOST_IDRACS[${tmp}]}
+			hostname=${PW_iDRACHOST_SHORTNAMES[${idracip}]}
+		fi
 	fi
 	
 	while [ $# -gt 0 ]; do
@@ -1657,9 +1662,6 @@ HOSTMGMT(){
 		shift 1
 	done
 	
-	tmp=${PW_ESXI_HOST_NAMES[${ESXIHOST}]}
-	idracip=${PW_HOST_IDRACS[${tmp}]}
-	hostname=${PW_iDRACHOST_SHORTNAMES[${idracip}]}
 	
 	c=0; spcA=''; spc1=`expr 21 - ${#hostname} - 1`; until [ ${c} = ${spc1} ]; do spcA="${spcA} "; c=`expr ${c} + 1`; done
 	c=0; spcB=''; spc1=`expr 18 - ${#ESXIHOST} - 1`; until [ ${c} = ${spc1} ]; do spcB="${spcB} "; c=`expr ${c} + 1`; done