diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
index c0511c69a4..66270cc325 100644
--- a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
@@ -230,6 +230,10 @@ Rectangle {
                 Tablet.playSound(TabletEnums.ButtonClick);
                 outputDeviceButton.outputMuted = !outputDeviceButton.outputMuted;
 
+                if (outputDeviceButton.outputMuted && !AudioScriptingInterface.muted) {
+                    AudioScriptingInterface.muted = true;
+                }
+
                 sendToScript({
                     "source": "SimplifiedTopBar.qml",
                     "method": "setOutputMuted",
diff --git a/scripts/system/simplifiedUI/simplifiedStatusIndicator/simplifiedStatusIndicator.js b/scripts/system/simplifiedUI/simplifiedStatusIndicator/simplifiedStatusIndicator.js
index a56e9f3a24..9968260034 100644
--- a/scripts/system/simplifiedUI/simplifiedStatusIndicator/simplifiedStatusIndicator.js
+++ b/scripts/system/simplifiedUI/simplifiedStatusIndicator/simplifiedStatusIndicator.js
@@ -57,22 +57,21 @@ function simplifiedStatusIndicator(properties) {
             that.statusChanged();
         }
 
+        var queryParamString = "type=heartbeat";
+        queryParamString += "&username=" + AccountServices.username;
+
         var displayNameToSend = MyAvatar.sessionDisplayName;
-        queryParamString += currentStatus;
         if (displayNameToSend === "") {
             displayNameToSend = MyAvatar.displayName;
         }
-
-        var queryParamString = "type=heartbeat";
-        queryParamString += "&username=" + AccountServices.username;
         queryParamString += "&displayName=" + displayNameToSend;
-        queryParamString += "&status=";
-        queryParamString += currentStatus;
+        queryParamString += "&status=" + currentStatus;
+        queryParamString += "&organization=" + location.hostname;
 
         var uri = REQUEST_URL + "?" + queryParamString;
 
         if (DEBUG) {
-            console.log("setStatus: " + uri);
+            console.log("simplifiedStatusIndicator: setStatus: " + uri);
         }
 
         request({
@@ -95,7 +94,7 @@ function simplifiedStatusIndicator(properties) {
         var uri = REQUEST_URL + "?" + queryParamString;
 
         if (DEBUG) {
-            console.log("getStatus: " + uri);
+            console.log("simplifiedStatusIndicator: getStatus: " + uri);
         }
 
         request({
@@ -173,7 +172,7 @@ function simplifiedStatusIndicator(properties) {
         var uri = REQUEST_URL + "?" + queryParamString;
 
         if (DEBUG) {
-            console.log("simplifiedStatusIndicator onDomainChanged: " + uri);
+            console.log("simplifiedStatusIndicator: onDomainChanged: " + uri);
         }
 
         request({
@@ -184,7 +183,7 @@ function simplifiedStatusIndicator(properties) {
             } else {
                 // successfully sent updateLocation
                 if (DEBUG) {
-                    console.log("Successfully updated location after domain change.");
+                    console.log("simplifiedStatusIndicator: Successfully updated location after domain change.");
                 }
             }
         });
diff --git a/scripts/system/simplifiedUI/simplifiedUI.js b/scripts/system/simplifiedUI/simplifiedUI.js
index fbf9972fc3..94eb9f84fd 100644
--- a/scripts/system/simplifiedUI/simplifiedUI.js
+++ b/scripts/system/simplifiedUI/simplifiedUI.js
@@ -469,8 +469,8 @@ function onStatusChanged() {
 }
 
 
-var simplifiedNametag = Script.require("./simplifiedNametag/simplifiedNametag.js");
-var SimplifiedStatusIndicator = Script.require("./simplifiedStatusIndicator/simplifiedStatusIndicator.js");
+var simplifiedNametag = Script.require("./simplifiedNametag/simplifiedNametag.js?" + Date.now());
+var SimplifiedStatusIndicator = Script.require("./simplifiedStatusIndicator/simplifiedStatusIndicator.js?" + Date.now());
 var si;
 var oldShowAudioTools;
 var oldShowBubbleTools;