diff --git a/data/interfaces/default/mobile_devices_table.html b/data/interfaces/default/mobile_devices_table.html
index 920816ec..df1d3331 100644
--- a/data/interfaces/default/mobile_devices_table.html
+++ b/data/interfaces/default/mobile_devices_table.html
@@ -15,9 +15,9 @@ DOCUMENTATION :: END
     <li class="registered-device" data-id="${device['device_id']}" data-name="${device['device_name']}">
         <span>
             <span class="toggle-left mobile-device-tooltip edit-mobile-device" data-toggle="tooltip" data-placement="top" title="Rename Device"><i class="fa fa-lg fa-pencil"></i></span>
-            <span class="mobile-device-name">${device['device_name']}</span>
+            <span class="mobile-device-name">${device['friendly_name'] or device['device_name']}</span>
             <input type="text" class="edit-mobile-device-name hidden" value="${device['device_name']}" />
-            <span class="toggle-right delete-mobile-device"><i class="fa fa-lg fa-times"></i></span>
+            <span class="toggle-right delete-mobile-device" data-toggle="tooltip" data-placement="top" title="Remove Device"><i class="fa fa-lg fa-times"></i></span>
         </span>
     </li>
     % endfor
@@ -25,6 +25,7 @@ DOCUMENTATION :: END
 
 <script>
     $('.mobile-device-tooltip').tooltip();
+    $('.delete-mobile-device').tooltip();
 
     $('.delete-mobile-device').click(function () {
         var device_id = $(this).closest('li').data('id');
diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py
index 29189f26..47000732 100644
--- a/plexpy/notifiers.py
+++ b/plexpy/notifiers.py
@@ -44,6 +44,7 @@ import plexpy
 import database
 import helpers
 import logger
+import mobile_app
 import request
 from plexpy.config import _BLACKLIST_KEYS, _WHITELIST_KEYS
 from plexpy.helpers import checked
@@ -690,6 +691,11 @@ class ANDROIDAPP(Notifier):
         if not subject or not body:
             return
 
+        # Check mobile device is still registered
+        if self.config['device_id'] and not mobile_app.get_mobile_devices(device_id=self.config['device_id']):
+            logger.warn(u"PlexPy Notifiers :: Unable to send Android app notification: device not registered.")
+            return
+
         data = {'app_id': self.ONESIGNAL_APP_ID,
                 'include_player_ids': [self.config['device_id']],
                 'headings': {'en': subject.encode("utf-8")},
@@ -740,7 +746,7 @@ class ANDROIDAPP(Notifier):
             devices_config = {'label': 'Device',
                               'description': 'No devices registered. ' \
                                   '<a data-tab-destination="tabs-android_app" data-toggle="tab" data-dismiss="modal" ' \
-                                  'style="cursor: pointer;">Click here</a> to get the Android App.',
+                                  'style="cursor: pointer;">Get the Android App</a> and register a device.',
                               'input_type': 'help'
                               }
         else: