diff --git a/hbd/client/plugins/os_info.py b/hbd/client/plugins/os_info.py
index c5f3570..ae8897b 100644
--- a/hbd/client/plugins/os_info.py
+++ b/hbd/client/plugins/os_info.py
@@ -63,6 +63,7 @@ class OSInfoPlugin(InfoPlugin):
                 "hbc_type": "full",
             }
             if self.config.get("owner"):
+                self.logger.debug(f"Adding owner from config: {self.config['owner']}")
                 data["owner"] = self.config["owner"]
             
             # Add Linux-specific distribution info
diff --git a/hbd/server/config.py b/hbd/server/config.py
index becac2b..3d0c8fc 100644
--- a/hbd/server/config.py
+++ b/hbd/server/config.py
@@ -309,7 +309,7 @@ def get_host_access(config, hostname) -> dict:
     """
     host_cfg = get_host_config(config, hostname)
 
-    owner = host_cfg.get("owner") or get_default_owner(config)
+    owner = host_cfg.get("owner") # or get_default_owner(config)
 
     managers = host_cfg.get("managers", [])
     if isinstance(managers, str):
diff --git a/hbd/server/udp.py b/hbd/server/udp.py
index def7be9..eef799c 100644
--- a/hbd/server/udp.py
+++ b/hbd/server/udp.py
@@ -372,10 +372,9 @@ def handle_datagram(msg: dict, addr, transport, ctx: dict):
             host.add_plugin_data(plugin_name, plugin_data, timestamp=now)
 
             # If os_info reports an owner and none is configured server-side, apply it
-            if plugin_name == "os_info" and not host.owner:
-                reported_owner = plugin_data.get("owner")
-                if reported_owner:
-                    host.owner = reported_owner
+            if plugin_name == "os_info":
+                if not host.owner:
+                    host.owner = plugin_data.get("owner", config_mod.get_default_owner(cfg))
             if DEBUG > 1:
                 print(f"Stored plugin data for {uname}: {plugin_name}")