diff --git a/setup.sh b/setup.sh
index a27f7c6..d5bc869 100644
--- a/setup.sh
+++ b/setup.sh
@@ -37,8 +37,8 @@ get_conf() {
   sudo -H -u $user mkdir $sync_directory_path
   cp $run_directory_path/conf-sync.sh $sync_directory_path/
   chown $user:users $sync_directory_path/conf-sync.sh # group
-  cp $run_directory_path/nas.mount $sync_directory_path/
-  chown $user:users $sync_directory_path/nas.mount # group
+  cp $run_directory_path/srv-nas.mount $sync_directory_path/
+  chown $user:users $sync_directory_path/srv-nas.mount # group
   sudo -H -u $user chmod u+x $sync_directory_path/conf-sync.sh
   sudo -H -u $user $sync_directory_path/conf-sync.sh
 }
@@ -49,6 +49,7 @@ set_conf() {
   ln -s $sync_directory_path/*.service $systemd_units_path/
   systemctl daemon-reload
   systemctl enable conf-sync.timer
+  systemctl mask systemd-ask-password-wall.path
 }
 
 rcs_links() {
@@ -121,7 +122,7 @@ echo "We're all good here!"
 echo "You should now:"
 echo "* set $user's password"
 echo "* lock root account"
-echo "* remove setup.sh and conf-sync.sh"
+echo "* remove setup.sh, srv-nas.mount and conf-sync.sh"
 echo "* reboot the SBC"
 echo "And perhaps:"
 echo "* set htop at your convenience"