diff -r 181323a59047 -r c57b8ac80fc6 Server/FormMain.cs
--- a/Server/FormMain.cs	Thu Aug 25 13:12:54 2016 +0200
+++ b/Server/FormMain.cs	Thu Aug 25 13:34:05 2016 +0200
@@ -230,7 +230,7 @@
             ResetCec();
 
             //Harmony
-            ResetHarmony();
+            ResetHarmonyAsync();
 
             //Setup Events
             PopulateEventsTreeView();
@@ -2549,13 +2549,14 @@
         /// <summary>
         /// 
         /// </summary>
-        private async void ResetHarmony(bool aForceAuth=false)
+        private async void ResetHarmonyAsync(bool aForceAuth=false)
         {
             // ConnectAsync already if we have an existing session cookie
             if (Properties.Settings.Default.HarmonyEnabled)
             {
                 try
                 {
+                    iButtonHarmonyConnect.Enabled = false;
                     await ConnectHarmonyAsync(aForceAuth);
                 }
                 catch (Exception ex)
@@ -2563,6 +2564,10 @@
                     Trace.WriteLine("Exception thrown by ConnectHarmonyAsync");
                     Trace.WriteLine(ex.ToString());
                 }
+                finally
+                {
+                    iButtonHarmonyConnect.Enabled = true;
+                }
             }
         }
 
@@ -2575,7 +2580,7 @@
         {
             // User is explicitaly trying to connect
             //Reset Harmony Hub connection forcing authentication
-            ResetHarmony(true);
+            ResetHarmonyAsync(true);
         }
 
         /// <summary>
@@ -2998,7 +3003,7 @@
             {
                 var sessionToken = File.ReadAllText("SessionToken");
                 Trace.WriteLine("Harmony: Reusing token: {0}", sessionToken);
-                Program.HarmonyClient.OpenAsync(sessionToken);
+                await Program.HarmonyClient.OpenAsync(sessionToken);
             }
             else
             {