diff --git a/Application/ApplicationManager.cs b/Application/ApplicationManager.cs
index b2b4a737..6c17f6b6 100644
--- a/Application/ApplicationManager.cs
+++ b/Application/ApplicationManager.cs
@@ -589,13 +589,11 @@ namespace IW4MAdmin.Application
 
         public async Task Stop()
         {
-            _tokenSource.Cancel();
-            
             foreach (var plugin in Plugins)
             {
                 try
                 {
-                    await plugin.OnUnloadAsync();
+                    await plugin.OnUnloadAsync().WithTimeout(Utilities.DefaultCommandTimeout);
                 }
                 catch (Exception ex)
                 {
@@ -603,6 +601,8 @@ namespace IW4MAdmin.Application
                 }
             }   
             
+            _tokenSource.Cancel();
+            
             IsRunning = false;
         }
 
diff --git a/Application/IW4MServer.cs b/Application/IW4MServer.cs
index 8bb8b27e..6c9a5aef 100644
--- a/Application/IW4MServer.cs
+++ b/Application/IW4MServer.cs
@@ -97,6 +97,7 @@ namespace IW4MAdmin
             client.Score = clientFromLog.Score;
             client.Ping = clientFromLog.Ping;
             client.Team = clientFromLog.Team;
+            client.TeamName = clientFromLog.TeamName;
             client.CurrentServer = this;
             client.State = ClientState.Connecting;