diff --git a/SteamDeck_rEFInd_install.sh b/SteamDeck_rEFInd_install.sh
index 9c62574..7eb83e9 100644
--- a/SteamDeck_rEFInd_install.sh
+++ b/SteamDeck_rEFInd_install.sh
@@ -1,7 +1,20 @@
 #!/bin/bash
 # A simple Steam Deck rEFInd automated install script
 
-sudo btrfs property set -ts / ro false
+passwd --status deck | tee ~/deck_passwd_status.txt
+awk '{
+	if($2 =="P")
+    {
+		print "Password is already set.";
+	  }
+    else
+    {
+		print "Password has not been set. Please set password for deck user now.";
+		system("passwd");
+	}
+}' ~/deck_passwd_status.txt
+
+sudo steamos-readonly disable
 sudo pacman-key --init
 sudo pacman-key --populate archlinux
 yes | sudo pacman -S refind
@@ -12,11 +25,21 @@ grep -A0 'Windows' ~/efibootlist.txt | tee ~/windows_boot.txt
 WINDOWS_BOOTNUM="$(grep -Eo '[0-9]{1,}' ~/windows_boot.txt)"
 # Disable Windows EFI boot entry
 sudo efibootmgr -b $WINDOWS_BOOTNUM -A
-#grep -A0 'rEFInd Boot Manager' ~/efibootlist.txt | tee ~/rEFInd_boot.txt
-grep -A0 'rEFInd' ~/efibootlist.txt | tee ~/rEFInd_boot.txt
+grep -A0 'rEFInd Boot Manager' ~/efibootlist.txt | tee ~/rEFInd_boot.txt
 REFIND_BOOTNUM="$(grep -Eo '[0-9]{1,}' ~/rEFInd_boot.txt)"
 # Delete rEFInd EFI boot entry from rEFInd-install... will be re-added later pointing to esp partition
 sudo efibootmgr -b $REFIND_BOOTNUM -B
+# Checking for duplicate rEFInd EFI boot entry, from previous script runs (or other sources)
+efibootmgr | tee ~/efibootlist2.txt
+grep -A0 'rEFInd' ~/efibootlist2.txt | tee ~/rEFInd_boot2.txt
+REFIND_BOOTNUM_ALT="$(grep -Eo '[0-9]{1,}' ~/rEFInd_boot2.txt)"
+
+# Deleting duplicate rEFInd boot entry, if one was found
+re='^[0-9]+$'
+if [[ $REFIND_BOOTNUM_ALT =~ $re ]]; then
+	sudo efibootmgr -b $REFIND_BOOTNUM_ALT -B
+fi
+
 yes | sudo cp -rf /boot/efi/EFI/refind/ /esp/efi
 # Renaming default rEFInd config file to keep for reference and backup
 sudo mv /esp/efi/refind/refind.conf /esp/efi/refind/refind-bkp.conf
@@ -29,8 +52,10 @@ sudo efibootmgr -c -d /dev/nvme0n1 -p 1 -L "rEFInd" -l \\efi\\refind\\refind_x64
 # Clean up temporary files
 yes | rm ~/deck_passwd_status.txt
 yes | rm ~/efibootlist.txt
+yes | rm ~/efibootlist2.txt
 yes | rm ~/windows_boot.txt
 yes | rm ~/rEFInd_boot.txt
+yes | rm ~/rEFInd_boot2.txt
 
-sudo btrfs property set -ts / ro true
+sudo steamos-readonly enable
 echo "rEFInd has now been installed."