diff --git a/libraries/plugins/src/plugins/Plugin.h b/libraries/plugins/src/plugins/Plugin.h
index fb5bf0ba55..0452c7fbfe 100644
--- a/libraries/plugins/src/plugins/Plugin.h
+++ b/libraries/plugins/src/plugins/Plugin.h
@@ -15,6 +15,7 @@
 #include "Forward.h"
 
 class Plugin : public QObject {
+    Q_OBJECT
 public:
     /// \return human-readable name
     virtual const QString& getName() const = 0;
@@ -63,6 +64,13 @@ public:
     virtual void saveSettings() const {}
     virtual void loadSettings() {}
 
+signals:
+    // These signals should be emitted when a device is first known to be available. In some cases this will
+    // be in `init()`, in other cases, like Neuron, this isn't known until activation.
+    // SDL2 isn't a device itself, but can have 0+ subdevices. subdeviceConnected is used in this case.
+    void deviceConnected(QString pluginName) const;
+    void subdeviceConnected(QString pluginName, QString subdeviceName) const;
+
 protected:
     bool _active { false };
     PluginContainer* _container { nullptr };
diff --git a/libraries/plugins/src/plugins/PluginManager.cpp b/libraries/plugins/src/plugins/PluginManager.cpp
index 86bdcfe818..64d771da6a 100644
--- a/libraries/plugins/src/plugins/PluginManager.cpp
+++ b/libraries/plugins/src/plugins/PluginManager.cpp
@@ -69,6 +69,15 @@ static DisplayPluginList displayPlugins;
 
 const DisplayPluginList& PluginManager::getDisplayPlugins() {
     static std::once_flag once;
+    static auto deviceAddedCallback = [](QString deviceName) {
+        qDebug() << "Added device: " << deviceName;
+        UserActivityLogger::getInstance().connectedDevice("display", deviceName);
+    };
+    static auto subdeviceAddedCallback = [](QString pluginName, QString deviceName) {
+        qDebug() << "Added subdevice: " << deviceName;
+        UserActivityLogger::getInstance().connectedDevice("display", pluginName + " | " + deviceName);
+    };
+
     std::call_once(once, [&] {
         // Grab the built in plugins
         displayPlugins = ::getDisplayPlugins();
@@ -84,7 +93,8 @@ const DisplayPluginList& PluginManager::getDisplayPlugins() {
         }
         auto& container = PluginContainer::getInstance();
         for (auto plugin : displayPlugins) {
-            UserActivityLogger::getInstance().connectedDevice("display", plugin->getName());
+            connect(plugin.get(), &Plugin::deviceConnected, this, deviceAddedCallback);
+            connect(plugin.get(), &Plugin::subdeviceConnected, this, subdeviceAddedCallback);
             plugin->setContainer(&container);
             plugin->init();
         }
@@ -106,6 +116,15 @@ void PluginManager::disableDisplayPlugin(const QString& name) {
 const InputPluginList& PluginManager::getInputPlugins() {
     static InputPluginList inputPlugins;
     static std::once_flag once;
+    static auto deviceAddedCallback = [](QString deviceName) {
+        qDebug() << "Added device: " << deviceName;
+        UserActivityLogger::getInstance().connectedDevice("input", deviceName);
+    };
+    static auto subdeviceAddedCallback = [](QString pluginName, QString deviceName) {
+        qDebug() << "Added subdevice: " << deviceName;
+        UserActivityLogger::getInstance().connectedDevice("input", pluginName + " | " + deviceName);
+    };
+
     std::call_once(once, [&] {
         inputPlugins = ::getInputPlugins();
 
@@ -122,6 +141,8 @@ const InputPluginList& PluginManager::getInputPlugins() {
         auto& container = PluginContainer::getInstance();
         for (auto plugin : inputPlugins) {
             UserActivityLogger::getInstance().connectedDevice("input", plugin->getName());
+            connect(plugin.get(), &Plugin::deviceConnected, this, deviceAddedCallback);
+            connect(plugin.get(), &Plugin::subdeviceConnected, this, subdeviceAddedCallback);
             plugin->setContainer(&container);
             plugin->init();
         }
diff --git a/plugins/hifiNeuron/src/NeuronPlugin.cpp b/plugins/hifiNeuron/src/NeuronPlugin.cpp
index 0a4bc7f8d2..e41472a8c5 100644
--- a/plugins/hifiNeuron/src/NeuronPlugin.cpp
+++ b/plugins/hifiNeuron/src/NeuronPlugin.cpp
@@ -387,6 +387,8 @@ bool NeuronPlugin::activate() {
     } else {
         qCDebug(inputplugins) << "NeuronPlugin: success connecting to " << _serverAddress.c_str() << ":" << _serverPort;
 
+        emit deviceConnected(getName());
+
         BRRegisterAutoSyncParmeter(_socketRef, Cmd_CombinationMode);
         return true;
     }
diff --git a/plugins/hifiSdl2/src/SDL2Manager.cpp b/plugins/hifiSdl2/src/SDL2Manager.cpp
index 0bdb68f830..14a1b0fbac 100644
--- a/plugins/hifiSdl2/src/SDL2Manager.cpp
+++ b/plugins/hifiSdl2/src/SDL2Manager.cpp
@@ -66,6 +66,7 @@ void SDL2Manager::init() {
                     auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
                     userInputMapper->registerDevice(joystick);
                     emit joystickAdded(joystick.get());
+                    emit subdeviceConnected(getName(), SDL_GameControllerName(controller));
                 }
             }
         }
@@ -157,6 +158,7 @@ void SDL2Manager::pluginUpdate(float deltaTime, const controller::InputCalibrati
                     _openJoysticks[id] = joystick;
                     userInputMapper->registerDevice(joystick);
                     emit joystickAdded(joystick.get());
+                    emit subdeviceConnected(getName(), SDL_GameControllerName(controller));
                 }
             } else if (event.type == SDL_CONTROLLERDEVICEREMOVED) {
                 if (_openJoysticks.contains(event.cdevice.which)) {
diff --git a/plugins/hifiSixense/src/SixenseManager.cpp b/plugins/hifiSixense/src/SixenseManager.cpp
index 9ea79a8b96..0993f9d12f 100644
--- a/plugins/hifiSixense/src/SixenseManager.cpp
+++ b/plugins/hifiSixense/src/SixenseManager.cpp
@@ -137,6 +137,12 @@ void SixenseManager::setSixenseFilter(bool filter) {
 void SixenseManager::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) {
     BAIL_IF_NOT_LOADED
 
+    static bool sixenseHasBeenConnected { false };
+    if (!sixenseHasBeenConnected && sixenseIsBaseConnected(0)) {
+        sixenseHasBeenConnected = true;
+        emit deviceConnected(getName());
+    }
+
     auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
     userInputMapper->withLock([&, this]() {
         _inputDevice->update(deltaTime, inputCalibrationData);
diff --git a/plugins/oculus/src/OculusDisplayPlugin.cpp b/plugins/oculus/src/OculusDisplayPlugin.cpp
index 1006d69f06..2b2ec5bdb0 100644
--- a/plugins/oculus/src/OculusDisplayPlugin.cpp
+++ b/plugins/oculus/src/OculusDisplayPlugin.cpp
@@ -28,6 +28,12 @@ bool OculusDisplayPlugin::internalActivate() {
     return result;
 }
 
+void OculusDisplayPlugin::init() {
+    Plugin::init();
+
+    emit deviceConnected(getName());
+}
+
 void OculusDisplayPlugin::cycleDebugOutput() {
     if (_session) {
         currentDebugMode = static_cast<ovrPerfHudMode>((currentDebugMode + 1) % ovrPerfHud_Count);
diff --git a/plugins/oculus/src/OculusDisplayPlugin.h b/plugins/oculus/src/OculusDisplayPlugin.h
index d6cd6f6f3d..ed6e0d13ea 100644
--- a/plugins/oculus/src/OculusDisplayPlugin.h
+++ b/plugins/oculus/src/OculusDisplayPlugin.h
@@ -17,6 +17,8 @@ class OculusDisplayPlugin : public OculusBaseDisplayPlugin {
 public:
     const QString& getName() const override { return NAME; }
 
+    void init() override;
+
     QString getPreferredAudioInDevice() const override;
     QString getPreferredAudioOutDevice() const override;
 
diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.cpp b/plugins/openvr/src/OpenVrDisplayPlugin.cpp
index fe406cc29a..f805132edd 100644
--- a/plugins/openvr/src/OpenVrDisplayPlugin.cpp
+++ b/plugins/openvr/src/OpenVrDisplayPlugin.cpp
@@ -41,6 +41,12 @@ bool OpenVrDisplayPlugin::isSupported() const {
     return openVrSupported();
 }
 
+void OpenVrDisplayPlugin::init() {
+    Plugin::init();
+
+    emit deviceConnected(getName());
+}
+
 bool OpenVrDisplayPlugin::internalActivate() {
     _container->setIsOptionChecked(StandingHMDSensorMode, true);
 
diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.h b/plugins/openvr/src/OpenVrDisplayPlugin.h
index fda5e37c2a..2e31bfa2c6 100644
--- a/plugins/openvr/src/OpenVrDisplayPlugin.h
+++ b/plugins/openvr/src/OpenVrDisplayPlugin.h
@@ -21,6 +21,8 @@ public:
     bool isSupported() const override;
     const QString& getName() const override { return NAME; }
 
+    void init() override;
+
     float getTargetFrameRate() const override { return TARGET_RATE_OpenVr; }
 
     void customizeContext() override;