diff --git a/dashboard-ui/advanced.html b/dashboard-ui/advanced.html
index 8dbb65362d..2946e104c6 100644
--- a/dashboard-ui/advanced.html
+++ b/dashboard-ui/advanced.html
@@ -11,7 +11,7 @@
 
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="#" data-role="button" class="ui-btn-active">General</a>
-                    <a href="advancedserversettings.html" data-role="button">Server</a>
+                    <a href="advancedserversettings.html" data-role="button">Http Server</a>
                     <a href="encodingsettings.html" data-role="button">Transcoding</a>
                 </div>
                 <form id="advancedConfigurationForm">
@@ -24,6 +24,13 @@
                                 This will start the tray icon on windows startup. To start the windows service, uncheck this and run the service from the windows control panel. Please note that you cannot run both at the same time, so you will need to exit the tray icon before starting the service.                        
                             </div>
                         </li>
+                        <li>
+                            <input type="checkbox" id="chkDebugLog" name="chkDebugLog" data-mini="true" />
+                            <label for="chkDebugLog">Enable debug logging </label>
+                        </li>
+                    </ul>
+                    <h2>Updates</h2>
+                    <ul data-role="listview" class="ulForm">
                         <li>
                             <label for="selectAutomaticUpdateLevel">Automatic update level</label>
                             <select name="selectAutomaticUpdateLevel" id="selectAutomaticUpdateLevel" data-mini="true">
@@ -35,9 +42,12 @@
                                 Dev builds are the bleeding edge. Released often, these build have not been tested. The application may crash and entire features may not work at all.                          
                             </div>
                         </li>
-                        <li>
-                            <input type="checkbox" id="chkDebugLog" name="chkDebugLog" data-mini="true" />
-                            <label for="chkDebugLog">Enable debug logging </label>
+                        <li id="fldEnableAutomaticRestart" style="display: none;">
+                            <input type="checkbox" id="chkEnableAutomaticRestart" name="chkEnableAutomaticRestart" data-mini="true" />
+                            <label for="chkEnableAutomaticRestart">Allow the server to restart automatically to apply updates</label>
+                            <div class="fieldDescription">
+                                The server will only restart during idle periods, when no users are active.                       
+                            </div>
                         </li>
                     </ul>
                     <h2>Cache Path</h2>
diff --git a/dashboard-ui/advancedserversettings.html b/dashboard-ui/advancedserversettings.html
index 7c7e999e27..4a1ec1c445 100644
--- a/dashboard-ui/advancedserversettings.html
+++ b/dashboard-ui/advancedserversettings.html
@@ -11,7 +11,7 @@
 
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="advanced.html" data-role="button">General</a>
-                    <a href="#" data-role="button" class="ui-btn-active">Server</a>
+                    <a href="#" data-role="button" class="ui-btn-active">Http Server</a>
                     <a href="encodingsettings.html" data-role="button">Transcoding</a>
                 </div>
                 <form class="advancedServerSettingsForm">
diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html
index 976bf5a508..a254b2a402 100644
--- a/dashboard-ui/encodingsettings.html
+++ b/dashboard-ui/encodingsettings.html
@@ -11,7 +11,7 @@
 
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="advanced.html" data-role="button">General</a>
-                    <a href="advancedserversettings.html" data-role="button">Server</a>
+                    <a href="advancedserversettings.html" data-role="button">Http Server</a>
                     <a href="#" data-role="button" class="ui-btn-active">Transcoding</a>
                 </div>
 
diff --git a/dashboard-ui/scripts/advancedconfigurationpage.js b/dashboard-ui/scripts/advancedconfigurationpage.js
index ddbd7a8f6e..2a05610d3e 100644
--- a/dashboard-ui/scripts/advancedconfigurationpage.js
+++ b/dashboard-ui/scripts/advancedconfigurationpage.js
@@ -15,6 +15,13 @@
         } else {
             $('#fldRunAtStartup', page).hide();
         }
+        $('#chkEnableAutomaticRestart', page).checked(config.EnableAutomaticRestart).checkboxradio("refresh");
+
+        if (systemInfo.CanSelfRestart) {
+            $('#fldEnableAutomaticRestart', page).show();
+        } else {
+            $('#fldEnableAutomaticRestart', page).hide();
+        }
 
         $('#selectAutomaticUpdateLevel', page).val(config.SystemUpdateLevel).selectmenu('refresh').trigger('change');
         $('#chkDebugLog', page).checked(config.EnableDebugLevelLogging).checkboxradio("refresh");
@@ -130,6 +137,7 @@
 
                 config.RunAtStartup = $('#chkRunAtStartup', form).checked();
                 config.SystemUpdateLevel = $('#selectAutomaticUpdateLevel', form).val();
+                config.EnableAutomaticRestart = $('#chkEnableAutomaticRestart', form).checked();
 
                 ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
             });