diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 0fee64802..2364b5a5b 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -622,7 +622,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 
 			$this->spawnToAll();
 
-			$this->server->getPluginManager()->callEvent($ev = new PlayerJoinEvent($this, $this->getName() . " joined the game"));
+			$this->server->getPluginManager()->callEvent($ev = new PlayerJoinEvent($this, TextFormat::YELLOW . $this->getName() . " joined the game"));
 			if(strlen(trim($ev->getJoinMessage())) > 0){
 				$this->server->broadcastMessage($ev->getJoinMessage());
 			}
@@ -1117,17 +1117,17 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 
 				$this->server->getPluginManager()->callEvent($ev = new PlayerPreLoginEvent($this, "Plugin reason"));
 				if($ev->isCancelled()){
-					$this->close($ev->getKickMessage(), "Plugin reason");
+					$this->close("", $ev->getKickMessage());
 
 					return;
 				}
 
 				if(!$this->server->isWhitelisted(strtolower($this->getName()))){
-					$this->close($this->username . " has left the game", "Server is white-listed");
+					$this->close(TextFormat::YELLOW . $this->username . " has left the game", "Server is white-listed");
 
 					return;
 				}elseif($this->server->getNameBans()->isBanned(strtolower($this->getName())) or $this->server->getIPBans()->isBanned($this->getAddress())){
-					$this->close($this->username . " has left the game", "You are banned");
+					$this->close(TextFormat::YELLOW . $this->username . " has left the game", "You are banned");
 
 					return;
 				}
@@ -1142,7 +1142,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 				foreach($this->server->getOnlinePlayers() as $p){
 					if($p !== $this and strtolower($p->getName()) === strtolower($this->getName())){
 						if($p->kick("logged in from another location") === false){
-							$this->close($this->getName() . " has left the game", "Already logged in");
+							$this->close(TextFormat::YELLOW . $this->getName() . " has left the game", "Logged in from another location");
 
 							return;
 						}else{
@@ -1173,7 +1173,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 				}
 
 				if(!($nbt instanceof Compound)){
-					$this->close($this->username . " has left the game", "invalid data");
+					$this->close(TextFormat::YELLOW . $this->username . " has left the game", "Invalid data");
 
 					return;
 				}
@@ -1192,7 +1192,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 
 				$this->server->getPluginManager()->callEvent($ev = new PlayerLoginEvent($this, "Plugin reason"));
 				if($ev->isCancelled()){
-					$this->close($ev->getKickMessage(), "Plugin reason");
+					$this->close(TextFormat::YELLOW . $this->username . " has left the game", $ev->getKickMessage());
 
 					return;
 				}
diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php
index 5751e3454..9b2984880 100644
--- a/src/pocketmine/Server.php
+++ b/src/pocketmine/Server.php
@@ -1635,7 +1635,7 @@ class Server{
 		$this->pluginManager->disablePlugins();
 
 		foreach($this->players as $player){
-			$player->close($player->getName() . " has left the game", $this->getProperty("settings.shutdown-message", "Server closed"));
+			$player->close(TextFormat::YELLOW . $player->getName() . " has left the game", $this->getProperty("settings.shutdown-message", "Server closed"));
 		}
 
 		foreach($this->getLevels() as $level){
diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php
index bf8cb5b25..8ab61fbd4 100644
--- a/src/pocketmine/level/Level.php
+++ b/src/pocketmine/level/Level.php
@@ -62,6 +62,7 @@ use pocketmine\tile\Spawnable;
 use pocketmine\tile\Tile;
 use pocketmine\utils\Cache;
 use pocketmine\utils\ReversePriorityQueue;
+use pocketmine\utils\TextFormat;
 use raklib\Binary;
 
 
@@ -237,7 +238,7 @@ class Level implements ChunkManager, Metadatable{
 		$defaultLevel = $this->server->getDefaultLevel();
 		foreach($this->getPlayers() as $player){
 			if($this === $defaultLevel or $defaultLevel === null){
-				$player->close($player->getName() . " has left the game", "forced default level unload");
+				$player->close(TextFormat::YELLOW . $player->getName() . " has left the game", "Forced default level unload");
 			}elseif($defaultLevel instanceof Level){
 				$player->teleport($this->server->getDefaultLevel()->getSafeSpawn());
 			}
diff --git a/src/pocketmine/network/RakLibInterface.php b/src/pocketmine/network/RakLibInterface.php
index d3c5908b9..b83500948 100644
--- a/src/pocketmine/network/RakLibInterface.php
+++ b/src/pocketmine/network/RakLibInterface.php
@@ -77,6 +77,7 @@ use pocketmine\network\protocol\UpdateBlockPacket;
 use pocketmine\network\protocol\UseItemPacket;
 use pocketmine\Player;
 use pocketmine\Server;
+use pocketmine\utils\TextFormat;
 use raklib\protocol\EncapsulatedPacket;
 use raklib\RakLib;
 use raklib\server\RakLibServer;
@@ -118,7 +119,7 @@ class RakLibInterface implements ServerInstance, SourceInterface{
 			$this->identifers->detach($player);
 			unset($this->players[$identifier]);
 			unset($this->identifiersACK[$identifier]);
-			$player->close($player->getName() . " has left the game", $reason);
+			$player->close(TextFormat::YELLOW . $player->getName() . " has left the game", $reason);
 		}
 	}