diff --git a/docs/default.nix b/docs/default.nix
index 63b60a16d..dd79c4590 100644
--- a/docs/default.nix
+++ b/docs/default.nix
@@ -54,17 +54,17 @@ let
 
   hmPath = toString ./..;
 
-  buildOptionsDocs =
-    args@{ modules, includeModuleSystemOptions ? true, isNixos ? false, ... }:
+  buildOptionsDocs = args@{ modules, includeModuleSystemOptions ? true, ... }:
     let
       options = (lib.evalModules {
         inherit modules;
         class = "homeManager";
       }).options;
     in pkgs.buildPackages.nixosOptionsDoc ({
-      options = builtins.removeAttrs options ([ ]
-        ++ (lib.optional (!includeModuleSystemOptions) "_module")
-        ++ (lib.optional (isNixos) "users"));
+      options = if includeModuleSystemOptions then
+        options
+      else
+        builtins.removeAttrs options [ "_module" ];
       transformOptions = opt:
         opt // {
           # Clean up declaration sites to not refer to the Home Manager
@@ -80,11 +80,7 @@ let
             else
               decl) opt.declarations;
         };
-    } // builtins.removeAttrs args [
-      "modules"
-      "includeModuleSystemOptions"
-      "isNixos"
-    ]);
+    } // builtins.removeAttrs args [ "modules" "includeModuleSystemOptions" ]);
 
   hmOptionsDocs = buildOptionsDocs {
     modules = import ../modules/modules.nix {
@@ -97,7 +93,6 @@ let
   nixosOptionsDocs = buildOptionsDocs {
     modules = [ ../nixos scrubbedPkgsModule dontCheckDefinitions ];
     includeModuleSystemOptions = false;
-    isNixos = true;
     variablelistId = "nixos-options";
     optionIdPrefix = "nixos-opt-";
   };
@@ -105,7 +100,6 @@ let
   nixDarwinOptionsDocs = buildOptionsDocs {
     modules = [ ../nix-darwin scrubbedPkgsModule dontCheckDefinitions ];
     includeModuleSystemOptions = false;
-    isNixos = true;
     variablelistId = "nix-darwin-options";
     optionIdPrefix = "nix-darwin-opt-";
   };
diff --git a/nixos/common.nix b/nixos/common.nix
index 7da7e9463..05931ad60 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -50,13 +50,6 @@ let
   };
 
 in {
-  options.users.users = mkOption {
-    type = types.attrsOf (types.submodule ({ name, config, ... }: {
-      config.packages = mkIf ((config.enable or true) && cfg.useUserPackages
-        && lib.hasAttr name cfg.users) [ cfg.users.${name}.home.path ];
-    }));
-  };
-
   options.home-manager = {
     useUserPackages = mkEnableOption ''
       installation of user packages through the
@@ -111,7 +104,10 @@ in {
   };
 
   config = (lib.mkMerge [
+    # Fix potential recursion when configuring home-manager users based on values in users.users #594
     (mkIf (cfg.useUserPackages && cfg.users != { }) {
+      users.users = (lib.mapAttrs
+        (_username: usercfg: { packages = [ usercfg.home.path ]; }) cfg.users);
       environment.pathsToLink = [ "/etc/profile.d" ];
     })
     (mkIf (cfg.users != { }) {