diff --git a/app/main.py b/app/main.py
index b84936c..a73eb66 100644
--- a/app/main.py
+++ b/app/main.py
@@ -937,16 +937,29 @@ def classify_signup_ip(ip: str) -> tuple[str, str, bool, str]:
             log.warning("ipapi.is lookup failed for ip=%s: %s", ip, exc)
             bounds = _ip_range_bounds(ip)
             return "unknown", "", False, bounds[3] if bounds else f"{ip}/32"
+        # ipapi.is returns company/asn as flat strings, not nested dicts
+        company = data.get("company")
+        org_name = company if isinstance(company, str) else (company or {}).get("name", "")
+
+        if not org_name:
+            asn_str = data.get("asn", "")
+            if isinstance(asn_str, str) and " " in asn_str:
+                org_name = asn_str.split(" ", 1)[1]  # "AS15169 Google LLC" → "Google LLC"
+
+        asn_obj = data.get("asn")
+        if isinstance(asn_obj, dict):
+            route = asn_obj.get("route", "")
+        else:
+            route = ""  # ipapi.is free tier returns asn as string, not nested object
+
         intel = {
             "is_datacenter": bool(data.get("is_datacenter")),
             "is_vpn": bool(data.get("is_vpn")),
             "is_proxy": bool(data.get("is_proxy")),
             "is_tor": bool(data.get("is_tor")),
             "is_abuser": bool(data.get("is_abuser")),
-            "org": ((data.get("company") or {}).get("name")
-                    or (data.get("asn") or {}).get("org") or ""),
+            "org": org_name,
         }
-        route = (data.get("asn") or {}).get("route") or ""
         bounds = _ip_range_bounds(ip, route)
         intel["cidr"] = bounds[3] if bounds else f"{ip}/32"
         cache_ip_intel(ip, intel, route)