diff --git a/scripts/Common/OS/setup.fish b/scripts/Common/OS/setup.fish
index 7f6d0ebe..d1618fcf 100644
--- a/scripts/Common/OS/setup.fish
+++ b/scripts/Common/OS/setup.fish
@@ -28,9 +28,9 @@ begin
                     "$name"
         end
 
-    chroot "$mountDir" usermod -aG wheel "$name"
+    and chroot "$mountDir" usermod -aG wheel "$name"
 
-    begin
+    and begin
         echo "$name ALL=(ALL:ALL) NOPASSWD: ALL"
     end | chroot "$mountDir" tee "/etc/sudoers.d/PortValhalla" > /dev/null