diff --git a/src/Logic/Osm/OsmConnection.ts b/src/Logic/Osm/OsmConnection.ts
index 2caa69b6cb..fa28ded72d 100644
--- a/src/Logic/Osm/OsmConnection.ts
+++ b/src/Logic/Osm/OsmConnection.ts
@@ -607,6 +607,10 @@ export class OsmConnection {
         this.FetchCapabilities().then(({ api, gpx }) => {
             this.apiIsOnline.setData(api)
             this.gpxServiceIsOnline.setData(gpx)
+        }).catch(err => {
+            console.log("Could not reach the api:", err)
+            this.apiIsOnline.set("unreachable")
+            this.gpxServiceIsOnline.set("unreachable")
         })
     }
 
diff --git a/src/Logic/State/UserRelatedState.ts b/src/Logic/State/UserRelatedState.ts
index 27f03e99e1..f58e66d4e1 100644
--- a/src/Logic/State/UserRelatedState.ts
+++ b/src/Logic/State/UserRelatedState.ts
@@ -416,6 +416,11 @@ export default class UserRelatedState {
                 typeof window === "undefined" ? "no" : window.navigator.share ? "yes" : "no",
             _iframe: Utils.isIframe ? "yes" : "no",
         })
+        if(!Utils.runningFromConsole){
+            amendedPrefs.data["_host"] = window.location.host
+            amendedPrefs.data["_path"] = window.location.pathname
+            amendedPrefs.data["_userAgent"] = navigator.userAgent
+        }
 
         for (const key in Constants.userJourney) {
             amendedPrefs.data["__userjourney_" + key] = Constants.userJourney[key]
diff --git a/src/UI/ThemeViewGUI.svelte b/src/UI/ThemeViewGUI.svelte
index 1ffd31c500..bccb69ae17 100644
--- a/src/UI/ThemeViewGUI.svelte
+++ b/src/UI/ThemeViewGUI.svelte
@@ -421,7 +421,7 @@
       <If condition={state.featureSwitches.featureSwitchFakeUser}>
         <div class="alert w-fit">Faking a user (Testmode)</div>
       </If>
-      {#if $apiState !== "online"}
+      {#if $apiState !== "online" && $apiState !== "unknown"}
         <div class="alert w-fit">API is {$apiState}</div>
       {/if}
     </div>