diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index fcc0174d..bb0e9a39 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -1070,7 +1070,7 @@ GUI(){
 	done
 }
 if [ ${action-x} ]; then
-	if [[ "${noheader}" != *" ${action} "* ]]; then
+	if [[ "${noheader}" != *" ${action} "* ]] && [[ "${noheader}" != *" ${2} "* ]]; then
 		DISP_HEADER
 	fi
 	case $action in
diff --git a/run.sh b/run.sh
index b4a1b9ac..f64145b5 100755
--- a/run.sh
+++ b/run.sh
@@ -12,7 +12,7 @@ else
 fi
 source /opt/idssys/nodemgmt/defaults.inc
 
-if [[ "${noheader}" != *" ${action} "* ]]; then
+if [[ "${noheader}" != *" ${action} "* ]] && [[ "${noheader}" != *" ${2} "* ]]; then
 #if [ "$1" != "service" ] && [ "$1" != "status-check" ] && [ "$1" != "nightlyrenew" ] && [ "$1" != "backup" ] && [ "$2" != "report" ]; then
 	if [ "${1}" = "gui" ]; then
 		DISP_HEADER