diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix
index 6efd099..ba8a952 100644
--- a/hosts/common/core/default.nix
+++ b/hosts/common/core/default.nix
@@ -36,8 +36,8 @@ in {
   ];
 
   hostSpec = {
-    username = "crow";
-    handle = "TheWanderingCrow";
+    username = lib.mkDefault "crow";
+    handle = lib.mkDefault "TheWanderingCrow";
   };
 
   networking.hostName = config.hostSpec.hostName;
diff --git a/hosts/nixos/Dragneel/default.nix b/hosts/nixos/Dragneel/default.nix
index f0f3ad8..d110ed6 100644
--- a/hosts/nixos/Dragneel/default.nix
+++ b/hosts/nixos/Dragneel/default.nix
@@ -39,6 +39,8 @@
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 
   hostSpec = {
+    username = "drag";
+    handle = "drag";
     hostName = "Dragneel";
     isVirtual = true;
     persistFolder = "/persist";
diff --git a/hosts/nixos/Natsirt/default.nix b/hosts/nixos/Natsirt/default.nix
index d8bd5e1..306516a 100644
--- a/hosts/nixos/Natsirt/default.nix
+++ b/hosts/nixos/Natsirt/default.nix
@@ -42,8 +42,8 @@
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 
   hostSpec = {
-    username = lib.mkForce "natsirt";
-    handle = lib.mkForce "natsirt";
+    username = "natsirt";
+    handle = "natsirt";
     hostName = "Natsirt";
     persistFolder = "/persist";
   };