diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index a279a591..7e59e830 100644
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -751,11 +751,14 @@ namespace TShockAPI
 
 			if (tsplr != null && tsplr.ReceivedInfo)
 			{
-				if (!tsplr.SilentKickInProgress)
+				if (!tsplr.SilentKickInProgress || tsplr.State > 1)
 				{
-					Utils.Broadcast(tsplr.Name + " left", Color.Yellow);
+					if (tsplr.State >= 2)
+					{
+                        Utils.Broadcast(tsplr.Name + " left", Color.Yellow);    
+					}
 				}
-				Log.Info(string.Format("{0} left.", tsplr.Name));
+				Log.Info(string.Format("{0} disconnected.", tsplr.Name));
 
 				if (tsplr.IsLoggedIn && !tsplr.IgnoreActionsForClearingTrashCan)
 				{