diff --git a/include/ClientGUI.py b/include/ClientGUI.py
index a4be697..1319e86 100755
--- a/include/ClientGUI.py
+++ b/include/ClientGUI.py
@@ -242,27 +242,7 @@ class FrameGUI( ClientGUICommon.FrameThatResizes ):
                     
                     HydrusData.ShowText( u'Starting server\u2026' )
                     
-                    if HC.PLATFORM_WINDOWS:
-                        
-                        my_exe = HC.BASE_DIR + os.path.sep + 'client.exe'
-                        
-                    else:
-                        
-                        my_exe = HC.BASE_DIR + os.path.sep + 'client'
-                        
-                    
-                    if sys.executable == my_exe:
-                    
-                        if HC.PLATFORM_WINDOWS: subprocess.Popen( [ HC.BASE_DIR + os.path.sep + 'server.exe' ] )
-                        else: subprocess.Popen( [ '.' + HC.BASE_DIR + os.path.sep + 'server' ] )
-                        
-                    else:
-                        
-                        if HC.PLATFORM_WINDOWS or HC.PLATFORM_OSX: python_bin = 'pythonw'
-                        else: python_bin = 'python'
-                        
-                        subprocess.Popen( [ python_bin, HC.BASE_DIR + os.path.sep + 'server.py' ] )
-                        
+                    subprocess.Popen( ["hydrus-server"] )
                     
                     time_waited = 0