diff --git a/chatclient/LoginWindow.xaml b/chatclient/LoginWindow.xaml
index 13b9691..eeaa12e 100644
--- a/chatclient/LoginWindow.xaml
+++ b/chatclient/LoginWindow.xaml
@@ -8,7 +8,7 @@
         xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" x:Class="chatclient.LoginWindow"
         mc:Ignorable="d"
         Title="LoginWindow" Height="590" Width="360" MinHeight="590" MinWidth="360" MaxHeight="590" MaxWidth="360" 
-        ResizeMode="NoResize">
+        ResizeMode="NoResize" Closing="Window_Closing">
 
     <TabControl>
         <TabItem Header="登录账号" Cursor="Hand" Height="40">
diff --git a/chatclient/LoginWindow.xaml.cs b/chatclient/LoginWindow.xaml.cs
index 7d2d871..ba1c4b1 100644
--- a/chatclient/LoginWindow.xaml.cs
+++ b/chatclient/LoginWindow.xaml.cs
@@ -213,6 +213,10 @@ namespace chatclient
             // 例如：UserName = LoadSavedUsername();
             // Update("UserName");
         }
+        public void Window_Closing(object sender, CancelEventArgs e)
+        {
+            if(MainWindow.token == null) Application.Current.Shutdown();
+        }
     }
 }
 
diff --git a/chatclient/MainWindow.xaml.cs b/chatclient/MainWindow.xaml.cs
index 6b2c2c2..34bef44 100644
--- a/chatclient/MainWindow.xaml.cs
+++ b/chatclient/MainWindow.xaml.cs
@@ -339,6 +339,7 @@ namespace chatclient
             Client?.Shutdown(SocketShutdown.Both);
             Client?.Close();
             Client?.Dispose();
+            token = null;
             _trayManager?.Dispose();
         }
     }