diff --git a/scripts/Arch/OS/setup.fish b/scripts/Arch/OS/setup.fish
index 8f598534..aeddb3f7 100644
--- a/scripts/Arch/OS/setup.fish
+++ b/scripts/Arch/OS/setup.fish
@@ -12,8 +12,8 @@ begin
 
     set -q USER_NAME || set -l USER_NAME manuel
     set -q USER_DISPLAYNAME
-    and set -q USER_GROUPS || set -l USER_GROUPS ""
-    and begin
+    set -q USER_GROUPS || set -l USER_GROUPS ""
+    begin
         set -l projectRoot (realpath "$dir/../../..")
         set -l projectName (basename "$projectRoot")
         set -l relativeDir (realpath --relative-to "$projectRoot" "$dir")