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