diff --git a/xCAT/postscripts/remoteshell b/xCAT/postscripts/remoteshell
index 8f71486c7..5c9396048 100755
--- a/xCAT/postscripts/remoteshell
+++ b/xCAT/postscripts/remoteshell
@@ -100,7 +100,7 @@ else
 fi
 rm /tmp/ssh_rsa_hostkey
 
-if [ -r /etc/xCATSN ] ; then
+if [[ $NTYPE = service ]]; then
    mkdir -p /etc/xcat/hostkeys
    cp /etc/ssh/ssh* /etc/xcat/hostkeys/.
 fi
diff --git a/xCAT/postscripts/syslog b/xCAT/postscripts/syslog
index fcff93555..9334a88ab 100755
--- a/xCAT/postscripts/syslog
+++ b/xCAT/postscripts/syslog
@@ -29,7 +29,7 @@ config_Rsyslog_C3()
   isReceiving=0
   isLocal=$1
 
-  if [ -f /etc/xCATMN ] || [ -f /etc/xCATSN ]
+  if [ -f /etc/xCATMN ] ||  [ $isSN -eq 1 ] 
   then 
     isReceiving=1
   fi