diff --git a/nixos/modules/admin.nix b/nixos/modules/admin.nix
index 07323da..eb37116 100644
--- a/nixos/modules/admin.nix
+++ b/nixos/modules/admin.nix
@@ -97,8 +97,8 @@ in
     services.openssh.openFirewall = true;
 
     users.users = mapAttrs (user: keys: {
-      shell = shells."${keys.shell}";
-      extraGroups = extraGroups;
+      shell = lib.mkDefault shells."${keys.shell}";
+      extraGroups = lib.mkDefault extraGroups;
       isNormalUser = true;
       openssh.authorizedKeys.keys = keys.keys;
     }) cfg.users;
diff --git a/nixos/modules/profiles/laptop.nix b/nixos/modules/profiles/laptop.nix
index 9cdc314..4d02bb0 100644
--- a/nixos/modules/profiles/laptop.nix
+++ b/nixos/modules/profiles/laptop.nix
@@ -25,7 +25,7 @@ with lib;
 
   age.identityPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
 
-  users.mutableUsers = mkDefault true;
+  users.mutableUsers = true;
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = mkDefault true;
diff --git a/nixos/stolas/default.nix b/nixos/stolas/default.nix
index 3c72921..46ae536 100644
--- a/nixos/stolas/default.nix
+++ b/nixos/stolas/default.nix
@@ -83,11 +83,14 @@
     settings.max-jobs = lib.mkDefault 16;
   };
 
-  dadada.backupClient.gs.enable = false;
-  dadada.backupClient.backup1.enable = true;
-  dadada.backupClient.backup2 = {
-    enable = true;
-    repo = "u355513-sub5@u355513-sub5.your-storagebox.de:/home/backup";
+  dadada = {
+    admin.enable = true;
+    backupClient.gs.enable = false;
+    backupClient.backup1.enable = true;
+    backupClient.backup2 = {
+      enable = true;
+      repo = "u355513-sub5@u355513-sub5.your-storagebox.de:/home/backup";
+    };
   };
 
   programs = {