diff --git a/interface/src/DiscoverabilityManager.cpp b/interface/src/DiscoverabilityManager.cpp
index 3c27e90152..7dca8c399a 100644
--- a/interface/src/DiscoverabilityManager.cpp
+++ b/interface/src/DiscoverabilityManager.cpp
@@ -66,8 +66,6 @@ void DiscoverabilityManager::updateLocation() {
             accountManager.authenticatedRequest(API_USER_LOCATION_PATH, QNetworkAccessManager::PutOperation,
                                                 JSONCallbackParameters(), QJsonDocument(rootObject).toJson());
         }
-    } else {
-        qDebug() << "not updating discoverability since it is currently set to none!";
     }
 }
 
@@ -76,7 +74,7 @@ void DiscoverabilityManager::removeLocation() {
     accountManager.authenticatedRequest(API_USER_LOCATION_PATH, QNetworkAccessManager::DeleteOperation);
 }
 
-void DiscoverabilityManager::setDiscoverability(Discoverability::Mode discoverabilityMode) {
+void DiscoverabilityManager::setDiscoverabilityMode(Discoverability::Mode discoverabilityMode) {
     if (_mode.get() != discoverabilityMode) {
         
         // update the setting to the new value
diff --git a/interface/src/DiscoverabilityManager.h b/interface/src/DiscoverabilityManager.h
index cb7791e82f..6d9f912928 100644
--- a/interface/src/DiscoverabilityManager.h
+++ b/interface/src/DiscoverabilityManager.h
@@ -33,7 +33,8 @@ public slots:
     void updateLocation();
     void removeLocation();
     
-    void setDiscoverability(Discoverability::Mode discoverabilityMode);
+    Discoverability::Mode getDiscoverabilityMode() { return _mode.get(); }
+    void setDiscoverabilityMode(Discoverability::Mode discoverabilityMode);
     
 private:
     DiscoverabilityManager();
diff --git a/interface/src/scripting/GlobalServicesScriptingInterface.cpp b/interface/src/scripting/GlobalServicesScriptingInterface.cpp
index 1b03fcd5e6..d39da47e78 100644
--- a/interface/src/scripting/GlobalServicesScriptingInterface.cpp
+++ b/interface/src/scripting/GlobalServicesScriptingInterface.cpp
@@ -11,6 +11,7 @@
 
 #include "AccountManager.h"
 #include "Application.h"
+#include "DiscoverabilityManager.h"
 #include "ResourceCache.h"
 
 #include "GlobalServicesScriptingInterface.h"
@@ -44,6 +45,32 @@ void GlobalServicesScriptingInterface::loggedOut() {
     emit GlobalServicesScriptingInterface::disconnected(QString("logout"));
 }
 
+QString GlobalServicesScriptingInterface::getFindableBy() const {
+    auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>();
+    
+    if (discoverabilityManager->getDiscoverabilityMode() == Discoverability::None) {
+        return "none";
+    } else if (discoverabilityManager->getDiscoverabilityMode() == Discoverability::Friends) {
+        return "friends";
+    } else {
+        return "all";
+    }
+}
+
+void GlobalServicesScriptingInterface::setFindableBy(const QString& discoverabilityMode) {
+    auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>();
+    
+    if (discoverabilityMode.toLower() == "none") {
+        discoverabilityManager->setDiscoverabilityMode(Discoverability::None);
+    } else if (discoverabilityMode.toLower() == "friends") {
+        discoverabilityManager->setDiscoverabilityMode(Discoverability::Friends);
+    } else if (discoverabilityMode.toLower() == "all") {
+        discoverabilityManager->setDiscoverabilityMode(Discoverability::All);
+    } else {
+        qDebug() << "GlobalServices setFindableBy called with an unrecognized value. Did not change discoverability.";
+    }
+}
+
 DownloadInfoResult::DownloadInfoResult() :
     downloading(QList<float>()),
     pending(0.0f)
diff --git a/interface/src/scripting/GlobalServicesScriptingInterface.h b/interface/src/scripting/GlobalServicesScriptingInterface.h
index ad19a9496c..a39219ba40 100644
--- a/interface/src/scripting/GlobalServicesScriptingInterface.h
+++ b/interface/src/scripting/GlobalServicesScriptingInterface.h
@@ -35,6 +35,7 @@ class GlobalServicesScriptingInterface : public QObject {
     Q_OBJECT
     
     Q_PROPERTY(QString username READ getUsername)
+    Q_PROPERTY(QString findableBy READ getFindableBy WRITE setFindableBy)
     
 public:
     static GlobalServicesScriptingInterface* getInstance();
@@ -48,6 +49,9 @@ public slots:
 private slots:
     void loggedOut();
     void checkDownloadInfo();
+    
+    QString getFindableBy() const;
+    void setFindableBy(const QString& discoverabilityMode);
 
 signals:
     void connected();