diff --git a/dashboard-ui/advanced.html b/dashboard-ui/advanced.html
index f792392290..58f7fd23b9 100644
--- a/dashboard-ui/advanced.html
+++ b/dashboard-ui/advanced.html
@@ -14,6 +14,9 @@
                         <li>
                             <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 control panel.                          
+                            </div>
                         </li>
                         <li>
                             <label for="selectAutomaticUpdateLevel">Automatic update level</label>
diff --git a/dashboard-ui/scripts/advancedconfigurationpage.js b/dashboard-ui/scripts/advancedconfigurationpage.js
index 260628ee69..a7c4c09c89 100644
--- a/dashboard-ui/scripts/advancedconfigurationpage.js
+++ b/dashboard-ui/scripts/advancedconfigurationpage.js
@@ -2,6 +2,14 @@
 
     function loadPage(page, config, systemInfo) {
 
+        var os = systemInfo.OperatingSystem.toLowerCase();
+        
+        if (os.indexOf('windows') != -1) {
+            $('#windowsStartupDescription', page).show();
+        } else {
+            $('#windowsStartupDescription', page).hide();
+        }
+        
         if (systemInfo.SupportsNativeWebSocket) {
 
             $('#fldWebSocketPortNumber', page).hide();