diff --git a/defaults.inc b/defaults.inc
index 1723df22..0054911a 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -3,7 +3,7 @@
 VERS='2.02072019'
 NODEHOSTS=10.5.10.51,10.5.10.52,10.5.10.53
 NODESERVICES=mysql,nginx,gitea,haproxy,keepalived,maxscale
-noheader=service,status-check,nightlyrenew,backup,report
+noheader=' service status-check nightlyrenew backup report '
 CERT_DAEMON='/usr/bin/certbot'
 FOLDER=/opt/idssys/nodemgmt
 SCRIPT=${FOLDER}/nodemgmt-scripts.sh
diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index c034cbb2..fcc0174d 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -1070,7 +1070,7 @@ GUI(){
 	done
 }
 if [ ${action-x} ]; then
-	if [[ "${noheader}" != *"${1}"* ]]; then
+	if [[ "${noheader}" != *" ${action} "* ]]; then
 		DISP_HEADER
 	fi
 	case $action in
diff --git a/run.sh b/run.sh
index 537569f2..b4a1b9ac 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} "* ]]; then
 #if [ "$1" != "service" ] && [ "$1" != "status-check" ] && [ "$1" != "nightlyrenew" ] && [ "$1" != "backup" ] && [ "$2" != "report" ]; then
 	if [ "${1}" = "gui" ]; then
 		DISP_HEADER