Index: TFP-WebServer/CommandExtensions/src/ChatHelpers.cs
===================================================================
--- TFP-WebServer/CommandExtensions/src/ChatHelpers.cs	(revision 499)
+++ TFP-WebServer/CommandExtensions/src/ChatHelpers.cs	(revision 503)
@@ -6,11 +6,14 @@
 				PrivateMessageConnections.SetLastPMSender (_sender, _receiver);
 				senderName = _sender.playerName;
+				
+				_receiver.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, _sender.entityId,
+					_message, null, EMessageSender.SenderIdAsPlayer, GeneratedTextManager.BbCodeSupportMode.SupportedAndAddEscapes));
 			} else {
 				senderName = "Server";
+				
+				_receiver.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1,
+					_message, null, EMessageSender.Server, GeneratedTextManager.BbCodeSupportMode.Supported));
 			}
 
-			_receiver.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1,
-				$"{senderName} (PM): {_message}", null,
-				EMessageSender.None));
 			string receiverName = _receiver.playerName;
 			receiverName = receiverName != null ? $"\"{receiverName}\"" : "unknownName";