diff --git a/home.admin/00infoLCD.sh b/home.admin/00infoLCD.sh
index 280a27433..eab2ee78f 100755
--- a/home.admin/00infoLCD.sh
+++ b/home.admin/00infoLCD.sh
@@ -69,10 +69,6 @@ while :
      setupStep=0
     fi
 
-    ###########################
-    # DISPLAY DURING SETUP
-    ###########################
-
     # before setup even started
     if [ ${setupStep} -eq 0 ]; then
             
@@ -125,6 +121,20 @@ while :
     # DISPLAY AFTER SETUP
     ###########################
 
+    # check if recovering/upgrade is running
+    if [ "${state}" = "recovering" ]; then
+      if [ ${#message} -eq 0 ]; then
+        message="Setup in Progress"
+      fi
+      l1="Upgrade/Recovering/Provisioning Mode\n"
+      l2="---> ${message}\n"
+      l3="Please keep running until auto-reboot."
+      boxwidth=$((${#localip} + 24))
+      dialog --backtitle "RaspiBlitz (${state})" --infobox "$l1$l2$l3" 5 ${boxwidth}
+      sleep 5
+      continue
+    fi
+
     # check if bitcoin is ready
     sudo -u bitcoin ${network}-cli -datadir=/home/bitcoin/.${network} getblockchaininfo 1>/dev/null 2>error.tmp
     clienterror=`cat error.tmp`
diff --git a/home.admin/_bootstrap.provision.sh b/home.admin/_bootstrap.provision.sh
index 38d66bd5b..938722036 100644
--- a/home.admin/_bootstrap.provision.sh
+++ b/home.admin/_bootstrap.provision.sh
@@ -35,6 +35,7 @@ source ${configExists}
 ##########################
 
 echo "### BASIC SYSTEM SETTINGS ###" >> ${logFile}
+sudo sed -i "s/^message=.*/message='Setup System'/g" ${infoFile}
 
 # set hostname data
 echo "Setting lightning alias: ${hostname}" >> ${logFile}
@@ -75,6 +76,7 @@ sudo chmod +x /etc/systemd/system/lnd.service >> ${logFile} 2>&1
 sudo systemctl enable lnd >> ${logFile} 2>&1
 
 # finish setup (SWAP, Benus, Firewall, Update, ..)
+sudo sed -i "s/^message=.*/message='Finishing Setup'/g" ${infoFile}
 /home/admin/90finishSetup.sh >> ${logFile} 2>&1
 
 # set the local network hostname
@@ -88,8 +90,9 @@ fi
 ##########################
 # PROVISIONING SERVICES
 ##########################
+sudo sed -i "s/^message=.*/message='Installing Services'/g" ${infoFile}
 
-  echo "### RUNNING PROVISIONING SERVICES ###" >> ${logFile}
+echo "### RUNNING PROVISIONING SERVICES ###" >> ${logFile}
 
 # TESTNET
 if [ "${chain}" = "test" ]; then
@@ -136,4 +139,5 @@ else
     echo "Provisioning TOR - keep default" >> ${logFile}
 fi
 
+sudo sed -i "s/^message=.*/message='Setup Done'/g" ${infoFile}
 echo "END Provisioning" >> ${logFile}
\ No newline at end of file
diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index dc69ae6a0..d904a8aa3 100644
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -40,6 +40,7 @@ echo "Resetting the InfoFile: ${infoFile}"
 echo "state=starting" > $infoFile
 echo "network=" >> $infoFile
 echo "chain=" >> $infoFile
+echo "message=" >> $infoFile
 sudo chmod 777 ${infoFile}
 
 ################################