diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 5a964b5e..4d3a8c59 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -148,8 +148,12 @@ case "$1" in
 				lip=$(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1)
 				for srvc in "${LOCAL_SERVICES[@]}"
 				do
-					if [ $(${NCMD} pgrep ${srvc} | wc -l) -lt "1" ]; then
-						echo "${NM_SERVICES[${srvc}]} is down" | mail -s "${NODE_HOSTNAME}-${lip}" ${STATUS_CHECK_EMAIL}
+					if [ $(pgrep ${srvc} | wc -l) -lt "1" ]; then
+						echo "${NM_SERVICES[${srvc}]} is down" | mail -s "${NODE_HOSTNAME}-${nip}" ${STATUS_CHECK_EMAIL}
+						touch ${FOLDER}/${nip}-${srvc}.down
+					elif [ -f ${FOLDER}/${nip}-${srvc}.down ]; then
+						echo "${NM_SERVICES[${srvc}]} is back UP!" | mail -s "${NODE_HOSTNAME}-${nip}" ${STATUS_CHECK_EMAIL}
+						rm -f ${FOLDER}/${nip}-${srvc}.down
 					fi
 				done
 			fi
@@ -163,10 +167,10 @@ case "$1" in
 					for srvc in "${NODE_SERVICES[@]}"
 					do
 						if [ $(${NCMD} pgrep ${srvc} | wc -l) -lt "1" ]; then
-							echo "${NM_SERVICES[${srvc}]} is down" | mail -s "${NODE_HOSTNAME}-${nip}" ${STATUS_CHECK_EMAIL}
+							echo "${NM_SERVICES[${srvc}]} is down" | mail -s "iDS-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL}
 							touch ${FOLDER}/${nip}-${srvc}.down
 						elif [ -f ${FOLDER}/${nip}-${srvc}.down ]; then
-							echo "${NM_SERVICES[${srvc}]} is back UP!" | mail -s "${NODE_HOSTNAME}-${nip}" ${STATUS_CHECK_EMAIL}
+							echo "${NM_SERVICES[${srvc}]} is back UP!" | mail -s "iDS-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL}
 							rm -f ${FOLDER}/${nip}-${srvc}.down
 						fi
 					done