diff --git a/dashboard-ui/advanced.html b/dashboard-ui/advanced.html
index b0e3c0d146..e6f3773866 100644
--- a/dashboard-ui/advanced.html
+++ b/dashboard-ui/advanced.html
@@ -15,7 +15,7 @@
                             <input type="checkbox" id="chkRunAtStartup" name="chkRunAtStartup" />
                             <label for="chkRunAtStartup">Run server at startup</label>
                             <div id="windowsStartupDescription" class="fieldDescription warningFieldDescription" style="display: none;">
-                                This will start the tray icon on windows startup. If you'd prefer to start the windows service instead, disable this and configure 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.                        
+                                This will start the tray icon on windows startup. If you'd prefer to start the windows service instead, disable 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>
diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html
index ddb0f7dd75..bc266de3ce 100644
--- a/dashboard-ui/dashboard.html
+++ b/dashboard-ui/dashboard.html
@@ -33,7 +33,6 @@
                             <div id="updateFail" style="color: #cc0000; display: none;">There was an error connecting to the remote Media Browser repository.</div>
                             <p id="ports"></p>
                             <p>Program data path: <span id="programDataPath"></span></p>
-                            <p>Bookmark url: <a id="bookmarkUrl" href="#" data-ajax="false" onclick="return !DashboardPage.bookmarkPageIfSupported(this.href);"></a></p>
                             <div id="pPluginUpdates"></div>
                         </div>
                     </div>
@@ -81,6 +80,7 @@
                             <p><a href="http://mediabrowser3.com/community" target="_blank">Community</a></p>
                             <p><a href="https://github.com/MediaBrowser/MediaBrowser" target="_blank">Github</a></p>
                             <p><a href="../swagger-ui/index.html" target="_blank">Interactive Api Documentation</a></p>
+                            <p>Server bookmark: <a id="bookmarkUrl" href="#" data-ajax="false" onclick="return !DashboardPage.bookmarkPageIfSupported(this.href);"></a></p>
                         </div>
                     </div>
 
diff --git a/dashboard-ui/wizardservice.html b/dashboard-ui/wizardservice.html
index cbc53b9051..bfaa0ebc8a 100644
--- a/dashboard-ui/wizardservice.html
+++ b/dashboard-ui/wizardservice.html
@@ -16,7 +16,7 @@
 
                 <p>Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.</p>
 
-                <p>If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel.</p>
+                <p>If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.</p>
 
                 <div class="wizardNavigation">
                     <button type="button" data-iconpos="left" data-icon="arrow-left" data-inline="true" onclick="history.back();">Previous</button>