diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 2364b5a5b..f563e935b 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -1969,9 +1969,9 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 	 * @return bool
 	 */
 	public function kick($reason = ""){
-		$this->server->getPluginManager()->callEvent($ev = new PlayerKickEvent($this, $reason, "Kicked player " . $this->username . "." . ($reason !== "" ? " With reason: $reason" : "")));
+		$this->server->getPluginManager()->callEvent($ev = new PlayerKickEvent($this, $reason, TextFormat::YELLOW . $this->username . " has left the game"));
 		if(!$ev->isCancelled()){
-			$message = $reason !== "" ? $reason : "Kicked from server";
+			$message = "Kicked by admin.". ($reason !== "" ? " Reason: ". $reason : "");
 			$this->sendMessage($message);
 			$this->close($ev->getQuitMessage(), $message);
 
diff --git a/src/pocketmine/command/defaults/KickCommand.php b/src/pocketmine/command/defaults/KickCommand.php
index a2388b4d9..c25d1adfd 100644
--- a/src/pocketmine/command/defaults/KickCommand.php
+++ b/src/pocketmine/command/defaults/KickCommand.php
@@ -51,12 +51,8 @@ class KickCommand extends VanillaCommand{
 		$name = array_shift($args);
 		$reason = trim(implode(" ", $args));
 
-		if($reason === ""){
-			$reason = "Kicked by an operator.";
-		}
-
 		if(($player = $sender->getServer()->getPlayer($name)) instanceof Player){
-			$player->kick("Kicked by admin.");
+			$player->kick($reason);
 		}else{
 			$sender->sendMessage($name . " not found.");
 		}