diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html
index 02a35e18a3..ddb0f7dd75 100644
--- a/dashboard-ui/dashboard.html
+++ b/dashboard-ui/dashboard.html
@@ -23,7 +23,12 @@
                             <div id="pUpdateNow" style="display: none;">
                                 <p><strong>A new version of Media Browser Server is available!</strong></p>
                                 <p id="newVersionNumber"></p>
-                                <button id="btnUpdateApplication" type="button" data-icon="download" data-theme="b" onclick="DashboardPage.updateApplication();">Update Now</button>
+                                <div id="btnUpdateApplicationContainer">
+                                    <button id="btnUpdateApplication" type="button" data-icon="download" data-theme="b" onclick="DashboardPage.updateApplication();">Update Now</button>
+                                </div>
+                                <div id="btnManualUpdateContainer">
+                                    Please shutdown the server and <a href="http://www.mediabrowser3.com/download" target="_blank">update manually.</a>
+                                </div>
                             </div>
                             <div id="updateFail" style="color: #cc0000; display: none;">There was an error connecting to the remote Media Browser repository.</div>
                             <p id="ports"></p>
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index 004465f246..ce0bc0b723 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -362,7 +362,7 @@
 
         $('#updateFail', page).hide();
 
-        if (dashboardInfo.SystemInfo.IsNetworkDeployed && !dashboardInfo.SystemInfo.HasPendingRestart) {
+        if (!dashboardInfo.SystemInfo.HasPendingRestart) {
 
             // Only check once every 10 mins
             if (DashboardPage.lastAppUpdateCheck && (new Date().getTime() - DashboardPage.lastAppUpdateCheck) < 600000) {
@@ -382,6 +382,14 @@
                     $('#pUpToDate', page).hide();
 
                     $('#pUpdateNow', page).show();
+                    
+                    if (dashboardInfo.SystemInfo.CanSelfUpdate) {
+                        $('#btnUpdateApplicationContainer', page).show();
+                        $('#btnManualUpdateContainer', page).hide();
+                    } else {
+                        $('#btnUpdateApplicationContainer', page).hide();
+                        $('#btnManualUpdateContainer', page).show();
+                    }
 
                     $('#newVersionNumber', page).html("Version " + version.versionStr + " is now available for download.");
                 }