diff --git a/website/src/components/website/dashboard/DashboardTransmitter.vue b/website/src/components/website/dashboard/DashboardTransmitter.vue
index 6b87582e..97c49644 100644
--- a/website/src/components/website/dashboard/DashboardTransmitter.vue
+++ b/website/src/components/website/dashboard/DashboardTransmitter.vue
@@ -223,7 +223,16 @@ export default {
                         advertise: isLive
                     });
                     if ((this.broadcast?.broadcast_settings || []).includes("Set title when going live")) {
-                        await authenticatedRequest("actions/set-title");
+                        if (isLive) {
+                            await authenticatedRequest("actions/set-title");
+                            this.$notyf.success("Detected going live - setting title & advertise");
+                        }
+                    } else {
+                        if (isLive) {
+                            this.$notyf.success("Detected going live - turning on advertise");
+                        } else {
+                            this.$notyf.success("Detected going offline - turning off advertise");
+                        }
                     }
                 } finally {
                     this.processingAdvertise = false;
diff --git a/website/src/utils/content-utils.js b/website/src/utils/content-utils.js
index 60d9da0f..2a663eed 100644
--- a/website/src/utils/content-utils.js
+++ b/website/src/utils/content-utils.js
@@ -820,7 +820,7 @@ export function recogniseRemoteServer(serverUrl) {
             recognisedID: null,
             recognisedPullLink: null,
             url: serverUrl,
-            server: url.pathname.split(":")[0].replace("//", ""),
+            server: url.hostname.split(":")[0].replace("//", ""),
             streamid: url.searchParams.get("streamid") || url.hash.slice(1).split("&").find((text, i, a) => text.includes("publish"))
         };