diff --git a/kvui.py b/kvui.py
index 6914a67ba5bf..7b32f6cfd24e 100644
--- a/kvui.py
+++ b/kvui.py
@@ -595,11 +595,10 @@ def command_button_action(self, button):
                                              "!help for server commands.")
 
     def connect_button_action(self, button):
+        self.ctx.username = None
         if self.ctx.server:
-            self.ctx.username = None
             async_start(self.ctx.disconnect())
         else:
-            self.ctx.username = None
             async_start(self.ctx.connect(self.server_connect_bar.text.replace("/connect ", "")))
 
     def on_stop(self):