diff --git a/roles/nix-user-cfg/tasks/main.yml b/roles/nix-user-cfg/tasks/main.yml
index 5578948..803ca8d 100644
--- a/roles/nix-user-cfg/tasks/main.yml
+++ b/roles/nix-user-cfg/tasks/main.yml
@@ -1,6 +1,13 @@
 ---
 # Configuring nix.
 
+- name: Adding current user to nix-users
+  ansible.builtin.user:
+    name: "{{ ansible_user_id }}"
+    groups: nix-users
+    append: true
+  become: true
+
 - name: Create configuration directory
   ansible.builtin.file:
     path: "{{ userconfigdir }}"
diff --git a/roles/zsh-user-cfg/tasks/main.yml b/roles/zsh-user-cfg/tasks/main.yml
index 6faf5d8..c6c85d2 100644
--- a/roles/zsh-user-cfg/tasks/main.yml
+++ b/roles/zsh-user-cfg/tasks/main.yml
@@ -6,3 +6,11 @@
   tags:
     - zsh
     - zsh-config
+
+- name: Default shell
+  ansible.builtin.user:
+    name: "{{ ansible_user_id }}"
+    shell: /usr/bin/zsh
+  tags:
+    - zsh
+    - zsh-defshell