diff --git a/data/interfaces/default/notification_config.html b/data/interfaces/default/notification_config.html
index d56049b9..35f43fa6 100644
--- a/data/interfaces/default/notification_config.html
+++ b/data/interfaces/default/notification_config.html
@@ -217,7 +217,7 @@
         }
     }
 
-    $('#pushbullet_apikey, #pushover_apitoken, #scripts_folder').on('change', function () {
+    $('#pushbullet_apikey, #pushover_apitoken, #scripts_folder, #join_apikey').on('change', function () {
         // Reload modal to update certain fields
         doAjaxCall('set_notification_config', $(this), 'tabs', true, reloadModal);
         return false;
diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py
index 0fa445f3..1fb1ea96 100644
--- a/plexpy/notifiers.py
+++ b/plexpy/notifiers.py
@@ -2633,6 +2633,8 @@ class JOIN(object):
 
     def return_config_options(self):
         devices = '<br>'.join(['%s: %s' % (v, k) for k, v in self.get_devices().iteritems() if k])
+        if not devices:
+            devices = 'Enter your Join API key to load your device list.'
 
         config_option = [{'label': 'Join API Key',
                           'value': self.apikey,