diff --git a/application/core/Players/Player.php b/application/core/Players/Player.php
index f1d43fe2..d3baed06 100644
--- a/application/core/Players/Player.php
+++ b/application/core/Players/Player.php
@@ -180,7 +180,7 @@ class Player {
 	 * @return bool
 	 */
 	public function isFakePlayer() {
-		return ($this->pid <= 0 || !$this->path);
+		return ($this->pid <= 0 || substr($this->login, 0, 1) === '*');
 	}
 
 	/**
diff --git a/application/core/Players/PlayerActions.php b/application/core/Players/PlayerActions.php
index 3487fb59..8272fe40 100644
--- a/application/core/Players/PlayerActions.php
+++ b/application/core/Players/PlayerActions.php
@@ -387,7 +387,7 @@ class PlayerActions {
 
 		// Announce kick
 		$title       = $this->maniaControl->authenticationManager->getAuthLevelName($admin->authLevel);
-		$chatMessage = $title . ' $<' . $admin->nickname . '$> kicked $<' . $target->nickname . '$>!';
+		$chatMessage = $title . ' ' . $admin->getEscapedNickname() . ' kicked ' . $target->getEscapedNickname() . '!';
 		$this->maniaControl->chat->sendInformation($chatMessage);
 		$this->maniaControl->log(Formatter::stripCodes($chatMessage));
 	}