diff --git a/modules/forgejo/default.nix b/modules/forgejo/default.nix
index 89e3709..b1cd06e 100644
--- a/modules/forgejo/default.nix
+++ b/modules/forgejo/default.nix
@@ -45,13 +45,16 @@ in {
       "L+ ${forgejo.stateDir}/custom/public/assets - - - - ${cfg.theme}"
     ++ lib.optional (!(builtins.isNull cfg.templates))
       "L+ ${forgejo.stateDir}/custom/templates - - - - ${cfg.templates}";
-}
-// lib.mkIf cfg.createUser {
-  users.users.${forgejo.user} = {
-    home = forgejo.stateDir;
-    useDefaultShell = true;
-    group = forgejo.group;
-    isSystemUser = true;
+
+  users.users = lib.mkIf cfg.createUser {
+    ${forgejo.user} = {
+      home = forgejo.stateDir;
+      useDefaultShell = true;
+      group = forgejo.group;
+      isSystemUser = true;
+    };
+  };
+  users.groups = lib.mkIf cfg.createUser {
+    ${forgejo.group} = {};
   };
-  users.groups.${forgejo.group} = {};
 }