diff --git a/home.admin/98repairMenu.sh b/home.admin/98repairMenu.sh
index 0a1914709..3456c7aaf 100755
--- a/home.admin/98repairMenu.sh
+++ b/home.admin/98repairMenu.sh
@@ -6,33 +6,51 @@ source /mnt/hdd/raspiblitz.conf
 
 askBackupCopy()
 {
-    whiptail --title "LND Data Backup" --yes-button "Backup" --no-button "Skip" --yesno "
+    whiptail --title "Lightning Data Backup" --yes-button "Backup" --no-button "Skip" --yesno "
 Before deleting your data, do you want
-to make a backup of all your LND Data
-and download that file to your laptop?
+to make a backup of all your Lightning Data
+and download the file(s) to your laptop?
 
-Download LND Data Backup now?
+Download Lightning Data Backup now?
       " 12 44
     if [ $? -eq 0 ]; then
-      clear
-      echo "*************************************"
-      echo "* PREPARING LND BACKUP DOWNLOAD"
-      echo "*************************************"
-      echo "please wait .."
-      sleep 2
-      /home/admin/config.scripts/lnd.compact.sh interactive
-      /home/admin/config.scripts/lnd.backup.sh lnd-export-gui
-      echo
-      echo "PRESS ENTER to continue once you are done downloading."
-      read key
+      if [ "${lightning}" == "lnd" ] || [ "${lnd}" = "on" ]; then
+        clear
+        echo "***********************************"
+        echo "* PREPARING THE LND BACKUP DOWNLOAD"
+        echo "***********************************"
+        echo "please wait .."
+        /home/admin/config.scripts/lnd.compact.sh interactive
+        /home/admin/config.scripts/lnd.backup.sh lnd-export-gui
+        echo
+        echo "PRESS ENTER to continue once you're done downloading."
+        read key
+      fi
+      if [ "${lightning}" == "cl" ] || [ "${cl}" = "on" ]; then
+        clear
+        echo "*******************************************"
+        echo "* PREPARING THE C-LIGHTNING BACKUP DOWNLOAD"
+        echo "*******************************************"
+        echo "please wait .."
+        /home/admin/config.scripts/cl.backup.sh cl-export-gui
+        echo
+        echo "PRESS ENTER to continue once you're done downloading."
+        read key
+      fi
     else
       clear
-      echo "*************************************"
-      echo "* JUST MAKING BACKUP TO SD CARD"
-      echo "*************************************"
+      echo "*****************************************"
+      echo "* JUST MAKING A BACKUP TO THE OLD SD CARD"
+      echo "*****************************************"
       echo "please wait .."
       sleep 2
-      /home/admin/config.scripts/lnd.backup.sh lnd-export
+      if [ "${lightning}" == "lnd" ] || [ "${lnd}" = "on" ]; then
+        /home/admin/config.scripts/lnd.backup.sh lnd-export
+      fi
+      if [ "${lightning}" == "cl" ] || [ "${cl}" = "on" ]; then
+        /home/admin/config.scripts/cl.backup.sh cl-export
+      fi
+      sleep 3
     fi
 }
 
diff --git a/home.admin/_provision.setup.sh b/home.admin/_provision.setup.sh
index 498b18f82..73849132a 100755
--- a/home.admin/_provision.setup.sh
+++ b/home.admin/_provision.setup.sh
@@ -155,7 +155,7 @@ if [ "${lightning}" == "lnd" ]; then
   /home/admin/_cache.sh set message "LND Setup"
 
   # password C (raspiblitz.setup)
-  if [ "${passwordC}" == "" ]; then
+  if [ "${passwordC}" == "" ] && [ "${lndrescue}" = "" ]; then
     /home/admin/config.scripts/blitz.error.sh _provision.setup.sh "missing-passwordc" "config: missing passwordC" "" ${logFile}
     exit 5
   fi
@@ -242,11 +242,11 @@ if [ "${lightning}" == "lnd" ]; then
     fi
   fi
 
-  # WALLET --> FROM RESCUEFILE
-  if [ $(sudo -u bitcoin ls /mnt/hdd/lnd/data/chain/bitcoin/mainnet/wallet.db 2>/dev/null | grep -c wallet.db) -gt 0 ]; then
+  # WALLET --> LNDRESCUE
+  if  [ "${lndrescue}" != "" ];then
 
-    # OK no further action needed
-    echo "WALLET --> FROM RESCUEFILE " >> ${logFile}
+    echo "WALLET --> LNDRESCUE " >> ${logFile}
+    /home/admin/_cache.sh set message "LND Wallet (LNDRESCUE)"
 
   # WALLET --> SEED + SCB 
   elif [ "${seedWords}" != "" ] && [ "${staticchannelbackup}" != "" ]; then
@@ -307,7 +307,7 @@ if [ "${lightning}" == "lnd" ]; then
       exit 14
   fi
 
-  # now sync macaroons & TLS zo other users
+  # now sync macaroons & TLS to other users
   /home/admin/config.scripts/lnd.credentials.sh sync >> ${logFile}
 
   # make a final lnd check