diff --git a/internal/analytics/types.go b/internal/analytics/types.go
index 3ec028fc..6a070e67 100644
--- a/internal/analytics/types.go
+++ b/internal/analytics/types.go
@@ -22,7 +22,7 @@ type BeaconEvent struct {
 	Browser           string `json:"browser"`
 	AuthProvider      string `json:"authProvider"`
 	FilterLength      int    `json:"filterLength"`
-	RemoteHostLength  int    `json:"remoteHostLength"`
+	Clients           int    `json:"clients"`
 	HasDocumentation  bool   `json:"hasDocumentation"`
 	HasCustomAddress  bool   `json:"hasCustomAddress"`
 	HasCustomBase     bool   `json:"hasCustomBase"`
diff --git a/internal/web/events.go b/internal/web/events.go
index 370330df..08695bd2 100644
--- a/internal/web/events.go
+++ b/internal/web/events.go
@@ -39,9 +39,9 @@ func (h *handler) streamEvents(w http.ResponseWriter, r *http.Request) {
 		Browser:          r.Header.Get("User-Agent"),
 		AuthProvider:     string(h.config.Authorization.Provider),
 		HasHostname:      h.config.Hostname != "",
-		HasCustomBase:    h.config.Base != "",
-		HasCustomAddress: h.config.Addr != "",
-		RemoteHostLength: len(h.clients),
+		HasCustomBase:    h.config.Base != "/",
+		HasCustomAddress: h.config.Addr != ":8080",
+		Clients:          len(h.clients),
 		HasDocumentation: len(pages) > 0,
 	}