diff --git a/Borepin/Borepin/PageModel/AddServerProcess/AuthPlainPageModel.cs b/Borepin/Borepin/PageModel/AddServerProcess/AuthPlainPageModel.cs
index 67671c3..c875679 100644
--- a/Borepin/Borepin/PageModel/AddServerProcess/AuthPlainPageModel.cs
+++ b/Borepin/Borepin/PageModel/AddServerProcess/AuthPlainPageModel.cs
@@ -111,17 +111,13 @@ namespace Borepin.PageModel.AddServerProcess
                 },
             };
 
-            if (_API.IsConnected)
+            try
             {
-                if (_API.IsConnected)
+                if (_API.IsConnecting || _API.IsConnected)
                 {
                     await _API.Disconnect().ConfigureAwait(true);
                     _API.UnbindEventHandler();
                 }
-            }
-
-            try
-            {
                 await _API.Connect(_ConnectionData).ConfigureAwait(false);
             }
             catch (Exception exception)
diff --git a/Borepin/Borepin/PageModel/ServerPageModel.cs b/Borepin/Borepin/PageModel/ServerPageModel.cs
index 16b1486..ead9b42 100644
--- a/Borepin/Borepin/PageModel/ServerPageModel.cs
+++ b/Borepin/Borepin/PageModel/ServerPageModel.cs
@@ -133,13 +133,14 @@ namespace Borepin.PageModel
             IsBusy = true;
             TestConnection = true;
 
-            if (_API.IsConnected)
-            {
-                await _API.Disconnect().ConfigureAwait(true);
-            }
-
             try
             {
+                if (_API.IsConnecting || _API.IsConnected)
+                {
+                    await _API.Disconnect().ConfigureAwait(true);
+                    _API.UnbindEventHandler();
+                }
+
                 await _API.Connect(Connection_Item).ConfigureAwait(false);
             }
             catch(Exception exception)