diff --git a/powerwall.sh b/powerwall.sh
index 3eb0d138..b73c02f5 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -1545,7 +1545,7 @@ SHUTDOWN_SERVER(){
 HOSTMGMT(){
 	echo -e "\n${idsCL[Yellow]}Host Controls${idsCL[Default]}"
 	DIVIDER . yellow
-
+	
 	while [ $# -gt 0 ]; do
 		case "$1" in
 			-h|-host) HOST="${2}";;
@@ -1554,22 +1554,37 @@ HOSTMGMT(){
 		esac
 		shift 1
 	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}]}
+		idracip=${PW_HOST_IDRACS[${tmp}]}
 	elif [ "${PW_ESXI_HOST_NAMES[${HOST}]}" != "" ]; then
 		ESXIHOST=${HOST}
+		tmp=${PW_ESXI_HOST_NAMES[${HOST}]}
+		idracip=${PW_HOST_IDRACS[${tmp}]}
 	elif [ "${PW_HOST_IDRACS[iDS-vMS-Host${HOST}]}" != "" ]; then
 		ESXIHOST=${PW_HOST_ADDRESSES[iDS-vMS-Host${HOST}]}
+		idracip=${PW_HOST_IDRACS[iDS-vMS-Host${tmp}]}
 	elif [ "${PW_HOST_IDRACS[${HOST}]}" != "" ]; then
-		tmp=${PW_HOST_IDRACS[${HOST}]}
-		ESXIHOST=${PW_HOST_ADDRESSES[${tmp}]}
+		ESXIHOST=${PW_HOST_ADDRESSES[${HOST}]}
+		idracip=${PW_HOST_IDRACS[${HOST}]}		
 	else
 		ESXIHOST=''
+		idracip=''
 	fi
-	[ "${ESXIHOST}" == "" ] && echo -e "Invalid host\n" && exit 1
+	([ "${ESXIHOST}" == "" ] || [ "${idracip}" == "" ]) && echo -e "Invalid host\n" && exit 1
+	
+	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
+	echo -en "${idsCL[LightCyan]} Host: ${idsCL[Green]}${hostname}${spcA}"
+	echo -en "${idsCL[LightCyan]}Host IP: ${idsCL[Green]}${ESXIHOST}${spcB}"
+	echo -e "${idsCL[LightCyan]}iDrac IP: ${idsCL[Green]}${idracip}${idsCL[Default]}"
+	DIVIDER . yellow 75
+	echo
+	
+	([ "${HOST}" == "" ] || ([ "${POWER}" == "" ] && [ "${ESXI}" == "" ])) && echo -e "Invalid command arguments\n" && exit 1
 	
 	if [ "${MODE}" == "esxi" ]; then
 		([ "${ESXI}" == "maint" ] || [ "${ESXI}" == "maintenance" ] || [ "${ESXI}" == "mm" ]) && SHUTDOWN_SERVER ${HOST} maintenance || SHUTDOWN_SERVER ${HOST}