diff --git a/machine-confs/generic.nix b/machine-confs/generic.nix
index 8e8746a..e4f7165 100644
--- a/machine-confs/generic.nix
+++ b/machine-confs/generic.nix
@@ -10,6 +10,9 @@
   #Many installs will need this, and it won't hurt either way
   services.qemuGuest.enable = true;
 
+  #Prevent user from being locked out of the system before switching to proper config
+  users.mutableUsers = pkgs.lib.mkForce true;
+
   swapDevices = [
     {
       device = "/var/lib/swapfile";
diff --git a/misc/custom-iso.nix b/misc/custom-iso.nix
index f68ca78..4a88230 100644
--- a/misc/custom-iso.nix
+++ b/misc/custom-iso.nix
@@ -21,7 +21,7 @@ let
       mv /mnt/etc/nixos/configuration.nix configuration.nix.old
       curl https://raw.githubusercontent.com/VSinerva/nixos-conf/main/misc/template-configuration.nix -o /mnt/etc/nixos/configuration.nix
 
-      nixos-install --no-root-password
+      nixos-install
     fi
   '';
 in
@@ -37,4 +37,7 @@ in
 
   #Many installs will need this, and it won't hurt either way
   services.qemuGuest.enable = true;
+
+  #Prevent user from being locked out of the system before switching to proper config
+  users.mutableUsers = pkgs.lib.mkForce true;
 }