Create users after installing software

scripts/Common/OS/install.fish

@@ -41,10 +41,6 @@ else
     runHook initialize || true
     and runHook installOS || true
 
-    and runHook addUsers || begin
-        source "$dir/users.fish"
-    end
-
     and runHook installSoftware || begin
         echo "Installing software..."
 
@@ -53,6 +49,10 @@ else
         end
     end
 
+    and runHook addUsers || begin
+        source "$dir/users.fish"
+    end
+
     runHook initializeUsers || begin
         if [ -n "$deployScript" ]
             source "$dir/../Scripts/config.fish"