diff --git a/bin/omarchy-fingerprint-setup b/bin/omarchy-fingerprint-setup
index fb98dfa..66d99cc 100755
--- a/bin/omarchy-fingerprint-setup
+++ b/bin/omarchy-fingerprint-setup
@@ -1,9 +1,15 @@
 #!/bin/bash
 
-yay -S --noconfirm --needed fprint
+yay -S --noconfirm --needed fprintd libfprint
+sudo systemctl enable --now fprintd.service
 
+# Add fingerprint authentication as a sufficient option
+grep -q 'pam_fprintd.so' /etc/pam.d/system-auth ||
+  sudo sed -i '/^auth.*pam_unix.so/ i auth       sufficient                  pam_fprintd.so' /etc/pam.d/system-auth
+
+# Enroll the first finger
 echo -e "\e[32m\nLet's setup your right index finger as the first fingerprint.\nKeep moving the finger around on sensor until the process completes.\n\e[0m"
-sudo fprintd-enroll `whoami`
+sudo fprintd-enroll $USER
 
 echo -e "\e[32m\nNow let's verify that it's working correctly.\e[0m\n"