diff --git a/machines/moritz-desktop/configuration.nix b/machines/moritz-desktop/configuration.nix
index 247f93e..edcd742 100644
--- a/machines/moritz-desktop/configuration.nix
+++ b/machines/moritz-desktop/configuration.nix
@@ -16,9 +16,6 @@
     ../../modules/shared.nix
   ];
 
-  # This is your user login name.
-  users.users.user.name = "moritz";
-
   users.users.root.openssh.authorizedKeys.keys = [
     ''
       ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDHlemuKagHwz2T5rEwgJNlVUdUdOXyPtCEzD73CrwY2zmpR4AMj7y9u3Rm7HwHUDjLap1ZFwg+53bAsVP6HFZccCXoIfO/8BL0WDGQJrfgb+A+UiRhSqSvyZ77bGJkadbBkadguz3qR3PHcb41DOlhuqVcHxsY8ceHMxAuyb0pLJVJLeytMD+CHS/r7hoj2hckTNAZ+VhCXBtdZfZ7uPUBxLfluYRNNMmdwCglsg3RUS242nJUzy3A84+CXIGeWmNG9Fu45IDkwMthxSW9klyU9R38R9DBDcugkyb6vz+JKSuRVAa47qh/kmtsYekfL3ul9D2JN32P8S+6ZoXx+gXupGJ0ltwJWAFkhLJ+yeXj9kCOv/mIUmCB14jMGsvKiSwV25O/twyjqe2LEkMVgimgrjEYoHu+ZTyp0iFtUvSrFo4tsAhfWPV9yj4F/hUksW7xKIwq5Niyx7he5M/XddudtnAximyiBDGCdJm1Ejl0UaGa6ZQv7y6VZdx0PyZuraT7l9ub8so6JlE4cVgSSU9vE0IS2QqBuHhsIjh8RVksoTR2NQbeDdGaGpGnq2C8y0rDXwE/EJA4LK45khX/GPn73n8F0kBG8dBrWgRDAEODpmebScO7d5mCeM0z3lPcRmh+3e3DPnVVOl+uR7udlc7NauLzl7q913UtxZaF1PlD7Q== cardno:15_584_308
diff --git a/machines/moritz-server/configuration.nix b/machines/moritz-server/configuration.nix
index 08cca30..a10240b 100644
--- a/machines/moritz-server/configuration.nix
+++ b/machines/moritz-server/configuration.nix
@@ -4,9 +4,6 @@
     ../../modules/shared.nix
   ];
 
-  # This is your user login name.
-  users.users.user.name = "moritz";
-
   # Set this for clan commands use ssh i.e. `clan machines update`
   # If you change the hostname, you need to update this line to root@<new-hostname>
   # This only works however if you have avahi running on your admin machine else use IP
diff --git a/modules/moritz/profiles/base.nix b/modules/moritz/profiles/base.nix
index 3917adb..b600edf 100644
--- a/modules/moritz/profiles/base.nix
+++ b/modules/moritz/profiles/base.nix
@@ -5,18 +5,13 @@
 , ...
 }:
 
-with lib;
+let
+  inherit (lib) getExe;
+in
 {
   imports = [
     inputs.home-manager.nixosModules.default
   ];
-
-  users.users.moritz = {
-    isNormalUser = true;
-    home = "/home/moritz";
-    extraGroups = [ "wheel" "networkmanager" "video" ];
-  };
-
   my = {
     nixpkgs = {
       overlays = [
diff --git a/modules/shared.nix b/modules/shared.nix
index 16a33e3..5d16a46 100644
--- a/modules/shared.nix
+++ b/modules/shared.nix
@@ -14,8 +14,9 @@
 
   # generate a random password for our user below
   # can be read using `clan secrets get <machine-name>-user-password` command
-  clan.user-password.user = "user";
-  users.users.user = {
+  clan.user-password.user = "moritz";
+
+  users.users.moritz = {
     isNormalUser = true;
     extraGroups = [
       "wheel"