diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index 2051d66..d55eeb1 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -32,6 +32,7 @@ in {
     ./services/udisks2.nix
     ./services/uptimed.nix
     ./services/userborn.nix
+    ./services/userdbd.nix
     ./services/xserver.nix
   ];
 
@@ -221,7 +222,6 @@ in {
   systemd = {
     sysupdate.enable = true;
     repart.enable = true;
-    userdbd.enable = true;
   };
 
   boot = {
diff --git a/hosts/common/services/userdbd.nix b/hosts/common/services/userdbd.nix
new file mode 100644
index 0000000..a732f28
--- /dev/null
+++ b/hosts/common/services/userdbd.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  services.userdbd.enable = true;
+}