diff --git a/inc/status.inc b/inc/status.inc
index a0d0dbaf..db95419f 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -355,7 +355,7 @@ It was down for $(SHOW_TIME $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${
 		[ "${STATUS_ACTION}" != "check" ] && echo -e "${idsCL[LightGreen]}Complete${idsCL[Default]}\n"
 		
 		touch ${NM_TMPFOLDER}/.replcheck
-		[ -f ${NM_TMPFOLDER}/.replcheck.fail ] && rm -f ${NM_TMPFOLDER}/.replcheck.fail
+		rm -f ${NM_TMPFOLDER}/.replcheck.fail
 	fi
 	
 	########################
diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 61a91afc..c017cd08 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -1378,7 +1378,11 @@ GUI(){
 							echo "$(date +%Y-%m-%d-%H-%M-%S) - LOCAL - ${NODE_HOSTNAME} - Completed Status Check" >> ${NM_LOGFILE}
 				
 							rm -f ${NM_LOGFOLDER}/status-check.lastrun
-							mv ${STATUSRUN_TMPFOLDER}/status-check.running ${NM_LOGFOLDER}/status-check.lastrun
+							if [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.replcheck)) -le 20 ]; then
+								mv ${STATUSRUN_TMPFOLDER}/status-check.running ${NM_LOGFOLDER}/status-check.repl.lastrun
+							else
+								mv ${STATUSRUN_TMPFOLDER}/status-check.running ${NM_LOGFOLDER}/status-check.lastrun
+							fi
 						
 							if [ "${3}" == "email" ]; then
 								echo -e "\n\n" >> ${NM_LOGFOLDER}/status-check.lastrun