diff --git a/.local/bin/station-setup-password b/.local/bin/station-setup-password
index e95e2f2..0723587 100755
--- a/.local/bin/station-setup-password
+++ b/.local/bin/station-setup-password
@@ -18,10 +18,10 @@ if gum confirm "Do you need to change your password?"; then
     if [[ ! -d /persist/passwords ]]; then
         sudo mkdir -p /persist/passwords
     fi
-    sudo sh -c 'mkpasswd -m sha-512 "$new_password" > /persist/passwords/chris'
+    sudo sh -c "mkpasswd -m sha-512 \"$new_password\" > /persist/passwords/$USER"
     echo
-    echo "New password written to /persist/passwords/chris"
+    echo "New password written to /persist/passwords/$USER"
     echo "Password will become active next time you run:" 
-    echo "sudo nixos-rebuild switch"e
+    echo "sudo nixos-rebuild switch"
     echo "Password change skipped."
 fi