diff -r a4a02cc952a0 -r f3322473db40 Server/MainForm.cs
--- a/Server/MainForm.cs	Sun Jan 18 18:32:32 2015 +0100
+++ b/Server/MainForm.cs	Sun Jan 18 19:01:29 2015 +0100
@@ -38,7 +38,6 @@
     /// </summary>
     public partial class MainForm : Form
     {
-
         DateTime LastTickTime;
         Display iDisplay;
         System.Drawing.Bitmap iBmp;
@@ -114,10 +113,6 @@
                 OpenDisplayConnection();
             }
 
-			//Check if "run on Windows startup" is enabled
-			checkBoxAutoStart.Checked=iStartupManager.Startup;
-
-
 			//Setup notification icon
 			SetupTrayIcon();
 
@@ -126,6 +121,13 @@
 			{
 				Visible = false;
 			}
+
+#if !DEBUG
+			//When not debugging we want the screen to be empty until a client takes over 
+			tableLayoutPanel.Controls.Clear();
+			tableLayoutPanel.RowStyles.Clear();
+			tableLayoutPanel.ColumnStyles.Clear();
+#endif
         }
 
 		/// <summary>
@@ -615,6 +617,9 @@
             }
 
             CheckFontHeight();
+			//Check if "run on Windows startup" is enabled
+			checkBoxAutoStart.Checked = iStartupManager.Startup;
+			//
             checkBoxConnectOnStartup.Checked = Properties.Settings.Default.DisplayConnectOnStartup;
 			checkBoxMinimizeToTray.Checked = Properties.Settings.Default.MinimizeToTray;
 			checkBoxStartMinimized.Checked = Properties.Settings.Default.StartMinimized;