diff --git a/dashboard-ui/notificationsettings.html b/dashboard-ui/notificationsettings.html
index d382775e92..0eed54bc4a 100644
--- a/dashboard-ui/notificationsettings.html
+++ b/dashboard-ui/notificationsettings.html
@@ -28,14 +28,28 @@
                                 <input type="checkbox" data-mini="true" id="chkFailedTasks" />
                                 <label for="chkFailedTasks">${OptionNotifyOnFailedTasks}</label>
 
+                                <input type="checkbox" data-mini="true" id="chkServerRestartRequired" />
+                                <label for="chkServerRestartRequired">${OptionNotifyOnServerRestartRequired}</label>
+
                                 <input type="checkbox" data-mini="true" id="chkUpdates" />
                                 <label for="chkUpdates">${OptionNotifyOnUpdates}</label>
 
-                                <input type="checkbox" data-mini="true" id="chkPlayback" />
-                                <label for="chkPlayback">${OptionNotifyOnPlayback}</label>
-
                                 <div class="fieldDescription">${SendNotificationHelp}</div>
                             </div>
+
+                            <br />
+
+                            <label>${HeaderEnableNotificationForPlayback}</label>
+                            <div data-role="controlgroup">
+                                <input type="checkbox" data-mini="true" id="chkVideoPlayback" />
+                                <label for="chkVideoPlayback">${OptionNotifyOnVideoPlayback}</label>
+
+                                <input type="checkbox" data-mini="true" id="chkAudioPlayback" />
+                                <label for="chkAudioPlayback">${OptionNotifyOnAudioPlayback}</label>
+
+                                <input type="checkbox" data-mini="true" id="chkGamePlayback" />
+                                <label for="chkGamePlayback">${OptionNotifyOnGamePlayback}</label>
+                            </div>
                         </li>
                     </ul>
                     <br />
diff --git a/dashboard-ui/scripts/loginpage.js b/dashboard-ui/scripts/loginpage.js
index ffacff403b..0a6e7bb435 100644
--- a/dashboard-ui/scripts/loginpage.js
+++ b/dashboard-ui/scripts/loginpage.js
@@ -34,11 +34,7 @@
             var users = response1[0];
             var config = response2[0];
 
-            var showManualForm = config.ManualLoginClients.filter(function (i) {
-
-                return i == "Mobile";
-
-            }).length || !users.length;
+            var showManualForm = config.RequireManualLoginForMobileApps || !users.length;
 
             if (showManualForm) {
 
diff --git a/dashboard-ui/scripts/notificationsettings.js b/dashboard-ui/scripts/notificationsettings.js
index 559620c27f..8a6139292e 100644
--- a/dashboard-ui/scripts/notificationsettings.js
+++ b/dashboard-ui/scripts/notificationsettings.js
@@ -9,7 +9,12 @@
             $('#chkNewLibraryContent', page).checked(notificationOptions.SendOnNewLibraryContent).checkboxradio('refresh');
             $('#chkFailedTasks', page).checked(notificationOptions.SendOnFailedTasks).checkboxradio('refresh');
             $('#chkUpdates', page).checked(notificationOptions.SendOnUpdates).checkboxradio('refresh');
-            $('#chkPlayback', page).checked(notificationOptions.SendOnPlayback).checkboxradio('refresh');
+            
+            $('#chkServerRestartRequired', page).checked(notificationOptions.SendOnServerRestartRequired).checkboxradio('refresh');
+
+            $('#chkVideoPlayback', page).checked(notificationOptions.SendOnVideoPlayback).checkboxradio('refresh');
+            $('#chkAudioPlayback', page).checked(notificationOptions.SendOnAudioPlayback).checkboxradio('refresh');
+            $('#chkGamePlayback', page).checked(notificationOptions.SendOnGamePlayback).checkboxradio('refresh');
 
         });
     }
@@ -23,7 +28,12 @@
             notificationOptions.SendOnNewLibraryContent = $('#chkNewLibraryContent', page).checked();
             notificationOptions.SendOnFailedTasks = $('#chkFailedTasks', page).checked();
             notificationOptions.SendOnUpdates = $('#chkUpdates', page).checked();
-            notificationOptions.SendOnPlayback = $('#chkPlayback', page).checked();
+            
+            notificationOptions.SendOnServerRestartRequired = $('#chkServerRestartRequired', page).checked();
+
+            notificationOptions.SendOnVideoPlayback = $('#chkVideoPlayback', page).checked();
+            notificationOptions.SendOnAudioPlayback = $('#chkAudioPlayback', page).checked();
+            notificationOptions.SendOnGamePlayback = $('#chkGamePlayback', page).checked();
 
             ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
         });