diff --git a/home.admin/_bootstrap.provision.sh b/home.admin/_bootstrap.provision.sh
index 86ee9080d..95f90ee90 100644
--- a/home.admin/_bootstrap.provision.sh
+++ b/home.admin/_bootstrap.provision.sh
@@ -293,6 +293,8 @@ if [ "${BTCPayServer}" = "on" ]; then
 
   # because BTCPAY server freezes during recovery .. it will get installed after reboot
   echo "sudo -u admin /home/admin/config.scripts/bonus.btcpayserver.sh on" >> /home/admin/setup.sh
+  sudo chmod +x /home/admin/setup.sh >> ${logFile}
+  sudo ls -la /home/admin/setup.sh >> ${logFile}
 
 else
   echo "Provisioning BTCPayServer - keep default" >> ${logFile}
diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index e6f41e17a..cebb4a447 100644
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -142,9 +142,11 @@ if [ ${afterSetupScriptExists} -eq 1 ]; then
   # echo out script to journal logs
   sudo cat /home/admin/setup.sh
   # execute the after boot script
-  sudo /home/admin/setup.sh
+  echo "Logs in stored to: /home/admin/raspiblitz.recover.log"
+  echo "\n***** RUNNING AFTER BOOT SCRIPT ******** " >> /home/admin/raspiblitz.recover.log
+  sudo /home/admin/setup.sh >> /home/admin/raspiblitz.recover.log
   # delete the after boot script
-  sudo rm /home/admin/setup.sh
+  sudo rm /home/admin/setup.sh 
   # reboot again
   echo "DONE wait 6 secs ... one more reboot needed ... "
   sudo shutdown -r now
diff --git a/home.admin/config.scripts/bonus.btcpayserver.sh b/home.admin/config.scripts/bonus.btcpayserver.sh
index d9b762fe1..0211be1a9 100644
--- a/home.admin/config.scripts/bonus.btcpayserver.sh
+++ b/home.admin/config.scripts/bonus.btcpayserver.sh
@@ -14,8 +14,12 @@ source /mnt/hdd/raspiblitz.conf
 source /home/admin/raspiblitz.info
 
 if [ "$1" = "status" ]; then
+
   if [ "${BTCPayServer}" = "on" ]; then
-    echo "installed=1"
+
+    echo "switchedon=1"
+    isInstalled=$(sudo ls /etc/systemd/system/btcpayserver.service 2>/dev/null | grep -c 'btcpayserver.service')
+    echo "installed=${isInstalled}"
 
     localIP=$(ip addr | grep 'state UP' -A2 | egrep -v 'docker0' | grep 'eth0\|wlan0' | tail -n1 | awk '{print $2}' | cut -f1 -d'/')
     echo "localIP='${localIP}'"
@@ -61,6 +65,7 @@ if [ "$1" = "status" ]; then
     fi
 
   else
+    echo "switchedon=0"
     echo "installed=0"
   fi
   exit 0
@@ -73,6 +78,17 @@ if [ "$1" = "menu" ]; then
   echo "# collecting status info ... (please wait)"
   source <(sudo /home/admin/config.scripts/bonus.btcpayserver.sh status)
 
+  if [ ${switchedon} -eq 0 ]; then
+      whiptail --title " BTCPay Server " --msgbox "BTCPay Server is not activated." 7 36
+      exit 0
+  fi
+
+  if [ ${installed} -eq 0 ]; then
+      whiptail --title " BTCPay Server " --msgbox "BTCPay Server needs to be re-installed.\nPress OK to start process." 8 45
+      /home/admin/config.scripts/bonus.btcpayserver.sh on
+      exit 0
+  fi
+
   text="Local Webrowser: https://${localIP}:${httpsPort}"
 
   if [ ${#publicDomain} -gt 0 ]; then