diff --git a/Tautulli.py b/Tautulli.py
index b08b011b..10d5608c 100755
--- a/Tautulli.py
+++ b/Tautulli.py
@@ -35,8 +35,8 @@ import time
 import tzlocal
 
 import plexpy
-from plexpy import config, database, helpers, logger, webstart
-if os.name == 'nt':
+from plexpy import common, config, database, helpers, logger, webstart
+if common.PLATFORM == 'Windows':
     from plexpy import windows
 
 # Register signals, such as CTRL + C
@@ -241,7 +241,7 @@ def main():
     webstart.start()
 
     # Windows system tray icon
-    if os.name == 'nt':
+    if common.PLATFORM == 'Windows':
         windows.set_startup()
         if plexpy.CONFIG.WIN_SYS_TRAY:
             windows.win_system_tray()
diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index 540f09d3..83ebbbff 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -448,7 +448,7 @@
                         </div>
 
                         <p class="help-block">Note: Web interface changes require a restart.</p>
-                        % if os.name == 'nt':
+                        % if common.PLATFORM == 'Windows':
                         <div class="checkbox">
                             <label>
                                 <input type="checkbox" class="http-settings" name="win_sys_tray" id="win_sys_tray" value="1" ${config['win_sys_tray']}> Enable System Tray Icon
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index e99a43fe..f051b01e 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -3179,7 +3179,7 @@ class WebInterface(object):
 
         # Enable or disable system startup
         if startup_changed:
-            if os.name == 'nt':
+            if common.PLATFORM == 'Windows':
                 windows.set_startup()
 
         # Get new server URLs for SSL communications and get new server friendly name