diff --git a/xCAT/postscripts/remoteshell b/xCAT/postscripts/remoteshell
index ec08cce70..3625bb456 100755
--- a/xCAT/postscripts/remoteshell
+++ b/xCAT/postscripts/remoteshell
@@ -4,7 +4,7 @@
 #
 # if on the Management Node, exit
 if [ -e /etc/xCATMN ]; then
-	logger -t xcat -p local4.info "Running on the Management Node ,  exiting "
+	logger -t xcat -p local4.info "remoteshell:Running on the Management Node ,  exiting "
    exit 0
 fi
 #  Linux or if AIX call aixremoteshell -d 
diff --git a/xCAT/postscripts/setupntp b/xCAT/postscripts/setupntp
index 894e8192d..1b62f24c0 100755
--- a/xCAT/postscripts/setupntp
+++ b/xCAT/postscripts/setupntp
@@ -5,6 +5,11 @@
 # setup NTP configuration on the compute nodes
 #
 #---------------------------------------------------------------------------
+# if on the Management Node, exit
+if [ -e /etc/xCATMN ]; then
+   logger -t xcat -p local4.info "setupntp:Running on the Management Node ,  exiting "
+   exit 0
+fi
 master=$MASTER
 setup=0
 sitemaster=$SITEMASTER