diff --git a/Droidnix/README.org b/Droidnix/README.org
index 117613628..5c5b5b979 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -817,8 +817,9 @@ This file installs and configures waybar
 let
   waybarPath = "${pkgs.waybar}/bin/waybar";
 
-  # Pick the first non-system user automatically
-  myUser = builtins.head (builtins.filter (u: config.users.users.${u}.isNormalUser != false) (builtins.attrNames config.users.users));
+  # Pick the first normal (non-system) user automatically
+  normalUsers = builtins.filter (u: config.users.users.${u}.isNormalUser != false) (builtins.attrNames config.users.users);
+  myUser = if normalUsers == [] then builtins.head (builtins.attrNames config.users.users) else builtins.head normalUsers;
 in
 {
   # Install Waybar in the system
diff --git a/Droidnix/generated/modules/traveldroid/desktop/waybar.nix b/Droidnix/generated/modules/traveldroid/desktop/waybar.nix
index 27985b244..253aa8276 100644
--- a/Droidnix/generated/modules/traveldroid/desktop/waybar.nix
+++ b/Droidnix/generated/modules/traveldroid/desktop/waybar.nix
@@ -3,8 +3,9 @@
 let
   waybarPath = "${pkgs.waybar}/bin/waybar";
 
-  # Pick the first non-system user automatically
-  myUser = builtins.head (builtins.filter (u: config.users.users.${u}.isNormalUser != false) (builtins.attrNames config.users.users));
+  # Pick the first normal (non-system) user automatically
+  normalUsers = builtins.filter (u: config.users.users.${u}.isNormalUser != false) (builtins.attrNames config.users.users);
+  myUser = if normalUsers == [] then builtins.head (builtins.attrNames config.users.users) else builtins.head normalUsers;
 in
 {
   # Install Waybar in the system