diff --git a/scripts/Common/OS/users.fish b/scripts/Common/OS/users.fish
index 8fd8f38b..d6f631b4 100644
--- a/scripts/Common/OS/users.fish
+++ b/scripts/Common/OS/users.fish
@@ -10,6 +10,7 @@ for name in (echo "$users" | jq '.[]' --raw-output0 | string split0)
     end
 
     set -l displayName (getUserConfig displayName --json)
+    set -l shell (getUserConfig defaultShell --json)
 
     sudo useradd --create-home (
             if echo "$displayName" | jq --exit-status > /dev/null
@@ -19,6 +20,10 @@ for name in (echo "$users" | jq '.[]' --raw-output0 | string split0)
         ) --groups (getUserConfig groups --apply 'builtins.concatStringsSep ","') \
         "$name"
 
+    if echo "$shell" | jq --exit-status > /dev/null
+        sudo chsh "$name" --shell (which (echo "$shell" | jq --raw-output))
+    end
+
     echo "Please Choose a New Password for User `$name`"
 
     while ! sudo passwd "$name"