diff -r f60cfcb98c9a -r 59ea5cb46258 Server/FormMain.cs
--- a/Server/FormMain.cs	Sun Aug 21 19:31:08 2016 +0200
+++ b/Server/FormMain.cs	Mon Aug 22 13:20:54 2016 +0200
@@ -1201,7 +1201,7 @@
             checkBoxAutoStart.Checked = iStartupManager.Startup;
 
             //Harmony settings
-            iTextBoxHarmonyHubAddress.Text = Properties.Settings.Default.HarmonyHubAddress;
+            iButtonHarmonyConnect.Enabled = Properties.Settings.Default.HarmonyEnabled;
 
             //CEC settings
             comboBoxHdmiPort.SelectedIndex = Properties.Settings.Default.CecHdmiPort - 1;
@@ -2525,7 +2525,7 @@
             base.WndProc(ref aMessage);
         }
 
-        private void checkBoxCecEnabled_CheckedChanged(object sender, EventArgs e)
+        private void iCheckBoxCecEnabled_CheckedChanged(object sender, EventArgs e)
         {
             //
             ResetCec();
@@ -2566,20 +2566,19 @@
         /// <summary>
         /// 
         /// </summary>
-        private async void ResetHarmony()
+        private async void ResetHarmony(bool aForceAuth=false)
         {
             // ConnectAsync already if we have an existing session cookie
-            if (Properties.Settings.Default.HarmonyEnabled && File.Exists("SessionToken"))
+            if (Properties.Settings.Default.HarmonyEnabled)
             {
-
-                iButtonHarmonyConnect.Enabled = false;
                 try
                 {
-                    await ConnectHarmonyAsync();
+                    await ConnectHarmonyAsync(aForceAuth);
                 }
-                finally
+                catch (Exception ex)
                 {
-                    iButtonHarmonyConnect.Enabled = true;
+                    Console.WriteLine("Exception thrown by ConnectHarmonyAsync");
+                    Console.WriteLine(ex.ToString());
                 }
             }
         }
@@ -2587,6 +2586,28 @@
         /// <summary>
         /// 
         /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void iButtonHarmonyConnect_Click(object sender, EventArgs e)
+        {
+            // User is explicitaly trying to connect
+            //Reset Harmony Hub connection forcing authentication
+            ResetHarmony(true);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void iCheckBoxHarmonyEnabled_CheckedChanged(object sender, EventArgs e)
+        {
+            iButtonHarmonyConnect.Enabled = iCheckBoxHarmonyEnabled.Checked;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
         private void SetupCecLogLevel()
         {
             //Setup log level
@@ -2975,31 +2996,8 @@
         /// <summary>
         /// 
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private async void iButtonHarmonyConnect_Click(object sender, EventArgs e)
-        {
-            //Save hub address
-            Properties.Settings.Default.HarmonyHubAddress = iTextBoxHarmonyHubAddress.Text;
-            Properties.Settings.Default.Save();
-
-            iButtonHarmonyConnect.Enabled = false;
-            try
-            {
-                await ConnectHarmonyAsync();
-            }
-            catch (Exception)
-            {
-                iButtonHarmonyConnect.Enabled = true;
-            }
-
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
         /// <returns></returns>
-        private async Task ConnectHarmonyAsync()
+        private async Task ConnectHarmonyAsync(bool aForceAuth=false)
         {
             if (Program.HarmonyClient != null)
             {
@@ -3013,7 +3011,7 @@
             Console.WriteLine("Harmony: Connecting... ");
             Program.HarmonyClient = new HarmonyHub.Client(iTextBoxHarmonyHubAddress.Text);
             //First create our client and login
-            if (File.Exists("SessionToken"))
+            if (File.Exists("SessionToken") && !aForceAuth)
             {
                 var sessionToken = File.ReadAllText("SessionToken");
                 Console.WriteLine("Harmony: Reusing token: {0}", sessionToken);
@@ -3087,5 +3085,6 @@
                 await Program.HarmonyClient.SendCommandAsync(d.Id, f.Name);
             }
         }
+
     }
 }