diff --git a/src/controllers/dashboard/dashboard.html b/src/controllers/dashboard/dashboard.html
index 9b177e3f34..58f0480c57 100644
--- a/src/controllers/dashboard/dashboard.html
+++ b/src/controllers/dashboard/dashboard.html
@@ -19,7 +19,7 @@
                         <button is="emby-button" type="button" class="raised btnRefresh">
                             <span>${ButtonScanAllLibraries}</span>
                         </button>
-                        <button is="emby-button" type="button" id="btnRestartServer" class="raised" onclick="DashboardPage.restart(this);" style="margin-left:0;">
+                        <button is="emby-button" type="button" id="btnRestartServer" class="raised hide" onclick="DashboardPage.restart(this);" style="margin-left:0;">
                             <span>${Restart}</span>
                         </button>
                         <button is="emby-button" type="button" id="btnShutdown" class="raised" onclick="DashboardPage.shutdown(this);">
diff --git a/src/controllers/dashboard/dashboard.js b/src/controllers/dashboard/dashboard.js
index 2bfecee080..0bc88b851b 100644
--- a/src/controllers/dashboard/dashboard.js
+++ b/src/controllers/dashboard/dashboard.js
@@ -200,6 +200,12 @@ import confirm from '../../components/confirm/confirm';
             view.querySelector('#operatingSystem').innerHTML = globalize.translate('DashboardOperatingSystem', systemInfo.OperatingSystem);
             view.querySelector('#architecture').innerHTML = globalize.translate('DashboardArchitecture', systemInfo.SystemArchitecture);
 
+            if (systemInfo.CanSelfRestart) {
+                view.querySelector('#btnRestartServer').classList.remove('hide');
+            } else {
+                view.querySelector('#btnRestartServer').classList.add('hide');
+            }
+
             view.querySelector('#cachePath').innerHTML = systemInfo.CachePath;
             view.querySelector('#logPath').innerHTML = systemInfo.LogPath;
             view.querySelector('#transcodePath').innerHTML = systemInfo.TranscodingTempPath;
diff --git a/src/controllers/dashboard/general.js b/src/controllers/dashboard/general.js
index a780f35e19..c18d0ff105 100644
--- a/src/controllers/dashboard/general.js
+++ b/src/controllers/dashboard/general.js
@@ -20,6 +20,11 @@ import alert from '../../components/alert';
             return '<option value="' + language.Value + '">' + language.Name + '</option>';
         })).val(config.UICulture);
         currentLanguage = config.UICulture;
+        if (systemInfo.CanSelfRestart || systemInfo.CanSelfUpdate) {
+            $('.autoUpdatesContainer', page).removeClass('hide');
+        } else {
+            $('.autoUpdatesContainer', page).addClass('hide');
+        }
 
         loading.hide();
     }