diff --git a/interface/src/DiscoverabilityManager.cpp b/interface/src/DiscoverabilityManager.cpp
index ff30bd1585..31ab8d9a29 100644
--- a/interface/src/DiscoverabilityManager.cpp
+++ b/interface/src/DiscoverabilityManager.cpp
@@ -77,8 +77,8 @@ void DiscoverabilityManager::updateLocation() {
         const QString NETWORK_ADDRESS_PORT_IN_LOCATION = "network_port";
         locationObject.insert(NETWORK_ADDRESS_PORT_IN_LOCATION, domainSockAddr.getPort());
 
-        const QString FRIENDS_ONLY_KEY_IN_LOCATION = "friends_only";
-        locationObject.insert(FRIENDS_ONLY_KEY_IN_LOCATION, (_mode.get() == Discoverability::Friends));
+        const QString AVAILABILITY_KEY_IN_LOCATION = "availability";
+        locationObject.insert(AVAILABILITY_KEY_IN_LOCATION, findableByString(static_cast<Discoverability::Mode>(_mode.get())));
 
         JSONCallbackParameters callbackParameters;
         callbackParameters.jsonCallbackReceiver = this;
@@ -140,13 +140,29 @@ void DiscoverabilityManager::setDiscoverabilityMode(Discoverability::Mode discov
         
         // update the setting to the new value
         _mode.set(static_cast<int>(discoverabilityMode));
-        
         updateLocation();  // update right away
 
         emit discoverabilityModeChanged(discoverabilityMode);
     }
 }
 
+
+QString DiscoverabilityManager::findableByString(Discoverability::Mode discoverabilityMode) {
+    if (discoverabilityMode == Discoverability::None) {
+        return "none";
+    } else if (discoverabilityMode == Discoverability::Friends) {
+        return "friends";
+    } else if (discoverabilityMode == Discoverability::Connections) {
+        return "connections";
+    } else if (discoverabilityMode == Discoverability::All) {
+        return "all";
+    } else {
+        qDebug() << "GlobalServices findableByString called with an unrecognized value.";
+        return "";
+    }
+}
+
+
 void DiscoverabilityManager::setVisibility() {
     Menu* menu = Menu::getInstance();
 
diff --git a/interface/src/DiscoverabilityManager.h b/interface/src/DiscoverabilityManager.h
index a6c717c93f..96190b25d9 100644
--- a/interface/src/DiscoverabilityManager.h
+++ b/interface/src/DiscoverabilityManager.h
@@ -43,6 +43,9 @@ public slots:
 signals:
     void discoverabilityModeChanged(Discoverability::Mode discoverabilityMode);
 
+public:
+    static QString findableByString(Discoverability::Mode discoverabilityMode);
+
 private slots:
     void handleHeartbeatResponse(QNetworkReply& requestReply);
     
diff --git a/interface/src/scripting/GlobalServicesScriptingInterface.cpp b/interface/src/scripting/GlobalServicesScriptingInterface.cpp
index bde94e80fa..f4a5ffb39c 100644
--- a/interface/src/scripting/GlobalServicesScriptingInterface.cpp
+++ b/interface/src/scripting/GlobalServicesScriptingInterface.cpp
@@ -53,31 +53,13 @@ void GlobalServicesScriptingInterface::loggedOut() {
     emit GlobalServicesScriptingInterface::disconnected(QString("logout"));
 }
 
-
-QString GlobalServicesScriptingInterface::findableByString(Discoverability::Mode discoverabilityMode) const {
-    if (discoverabilityMode == Discoverability::None) {
-        return "none";
-    } else if (discoverabilityMode == Discoverability::Friends) {
-        return "friends";
-    } else if (discoverabilityMode == Discoverability::Connections) {
-        return "connections";
-   } else if (discoverabilityMode == Discoverability::All) {
-        return "all";
-    } else {
-        qDebug() << "GlobalServices findableByString called with an unrecognized value.";
-        return "";
-    }
-}
-
-
 QString GlobalServicesScriptingInterface::getFindableBy() const {
     auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>();
-    return findableByString(discoverabilityManager->getDiscoverabilityMode());
+    return DiscoverabilityManager::findableByString(discoverabilityManager->getDiscoverabilityMode());
 }
 
 void GlobalServicesScriptingInterface::setFindableBy(const QString& discoverabilityMode) {
     auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>();
-    
     if (discoverabilityMode.toLower() == "none") {
         discoverabilityManager->setDiscoverabilityMode(Discoverability::None);
     } else if (discoverabilityMode.toLower() == "friends") {
@@ -92,7 +74,7 @@ void GlobalServicesScriptingInterface::setFindableBy(const QString& discoverabil
 }
 
 void GlobalServicesScriptingInterface::discoverabilityModeChanged(Discoverability::Mode discoverabilityMode) {
-    emit findableByChanged(findableByString(discoverabilityMode));
+    emit findableByChanged(DiscoverabilityManager::findableByString(discoverabilityMode));
 }
 
 DownloadInfoResult::DownloadInfoResult() :
diff --git a/interface/src/scripting/GlobalServicesScriptingInterface.h b/interface/src/scripting/GlobalServicesScriptingInterface.h
index 8d8b78e149..63294fc656 100644
--- a/interface/src/scripting/GlobalServicesScriptingInterface.h
+++ b/interface/src/scripting/GlobalServicesScriptingInterface.h
@@ -66,8 +66,6 @@ private:
     GlobalServicesScriptingInterface();
     ~GlobalServicesScriptingInterface();
     
-    QString findableByString(Discoverability::Mode discoverabilityMode) const;
-
     bool _downloading;
 };