diff --git a/application/core/Players/PlayerActions.php b/application/core/Players/PlayerActions.php
index 65db9756..c75c1ac4 100644
--- a/application/core/Players/PlayerActions.php
+++ b/application/core/Players/PlayerActions.php
@@ -192,7 +192,10 @@ class PlayerActions {
 		$target = $this->maniaControl->playerManager->getPlayer($targetLogin);
 		$title = $this->maniaControl->authenticationManager->getAuthLevelName($admin->authLevel);
 
-		$success = $this->maniaControl->client->query('Kick', $target->login, $message); //TODO bestätigung
+		if($target->isFakePlayer())
+			$success = $this->maniaControl->client->query('DisconnectFakePlayer', $target->login);
+		else
+			$success = $this->maniaControl->client->query('Kick', $target->login, $message); //TODO bestätigung
 		if (!$success) {
 			$this->maniaControl->chat->sendError('Error occurred: ' . $this->maniaControl->getClientErrorText(), $admin->login);
 			return;
diff --git a/application/core/Players/PlayerList.php b/application/core/Players/PlayerList.php
index d7442807..aa768e92 100644
--- a/application/core/Players/PlayerList.php
+++ b/application/core/Players/PlayerList.php
@@ -66,15 +66,14 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
 	public function __construct(ManiaControl $maniaControl) {
 		$this->maniaControl = $maniaControl;
 
-		$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(ManialinkManager::CB_MAIN_WINDOW_CLOSED, $this,
-			'closeWidget');
-		$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_CLOSE_PLAYER_ADV , $this,
-			'closePlayerAdvancedWidget');
-		$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this,
-			'handleManialinkPageAnswer');
+		$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(ManialinkManager::CB_MAIN_WINDOW_CLOSED, $this, 'closeWidget');
+		$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_CLOSE_PLAYER_ADV , $this, 'closePlayerAdvancedWidget');
+		$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this, 'handleManialinkPageAnswer');
+
+		//Update Widget Events
 		$this->maniaControl->callbackManager->registerCallbackListener(PlayerManager::CB_PLAYERINFOCHANGED, $this, 'updateWidget');
-		$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERCONNECT, $this, 'updateWidget');
-		$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERDISCONNECT, $this, 'updateWidget');
+		$this->maniaControl->callbackManager->registerCallbackListener(PlayerManager::CB_PLAYERDISCONNECTED, $this, 'updateWidget');
+		$this->maniaControl->callbackManager->registerCallbackListener(PlayerManager::CB_PLAYERJOINED, $this, 'updateWidget');
 		$this->maniaControl->callbackManager->registerCallbackListener(AuthenticationManager::CB_AUTH_LEVEL_CHANGED, $this, 'updateWidget');
 
 		//settings
@@ -142,8 +141,6 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
 		$y -= 10;
 		foreach($players as $listPlayer){
 
-			//$path = substr($listPlayer->path, 6);
-			//$path = $listPlayer->getCountry() . " - " . $listPlayer->getProvince();
 			$path = $listPlayer->getProvince();
 			$playerFrame = new Frame();
 			$frame->add($playerFrame);
@@ -316,7 +313,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
 		}
 
 		//show advanced window
-		if($this->playersListShown[$player->login] != self::SHOWN_MAIN_WINDOW){
+		if($this->playersListShown[$player->login] != false && $this->playersListShown[$player->login] != self::SHOWN_MAIN_WINDOW){
 			$frame = $this->showAdvancedPlayerWidget($this->playersListShown[$player->login]);
 			$maniaLink->add($frame);
 		}
@@ -342,6 +339,8 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
 	 * @return Frame
 	 */
 	public function showAdvancedPlayerWidget($login){
+		$player = $this->maniaControl->playerManager->getPlayer($login);
+
 		//todo all configurable or as constants
 		$x = $this->width / 2 + 2.5;
 		$width = 35;
@@ -383,8 +382,6 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
 		$label->setText("Advanced Actions");
 		$label->setTextColor($textColor);
 
-		$player = $this->maniaControl->playerManager->getPlayer($login);
-
 		//Show Nickname
 		$label = new Label_Text();
 		$frame->add($label);
@@ -619,11 +616,17 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
 	public function updateWidget(array $callback){
 		foreach($this->playersListShown as $login => $shown){
 			if($shown){
+				//Check if Shown player still exists
+				if($this->maniaControl->playerManager->getPlayer($shown) == null){
+					$this->playersListShown[$login] = false;
+				}
 				$player = $this->maniaControl->playerManager->getPlayer($login);
-				if($player != null)
+				if($player != null){
 					$this->showPlayerList($player);
-				else
+				}else{
+					//if player with the open widget disconnected remove him from the shownlist
 					unset($this->playersListShown[$login]);
+				}
 			}
 		}
 	}
diff --git a/application/core/Players/PlayerManager.php b/application/core/Players/PlayerManager.php
index 04689e89..660aa455 100644
--- a/application/core/Players/PlayerManager.php
+++ b/application/core/Players/PlayerManager.php
@@ -21,6 +21,7 @@ class PlayerManager implements CallbackListener {
 	 * Constants
 	 */
 	const CB_PLAYERJOINED = 'PlayerManagerCallback.PlayerJoined';
+	const CB_PLAYERDISCONNECTED = 'PlayerManagerCallback.PlayerDisconnected';
 	const CB_ONINIT = 'PlayerManagerCallback.OnInit';
 	const CB_PLAYERINFOCHANGED = 'PlayerManagerCallback.PlayerInfoChanged';
 	const TABLE_PLAYERS = 'mc_players';
@@ -156,6 +157,9 @@ class PlayerManager implements CallbackListener {
 		$login = $callback[1][0];
 		$player = $this->removePlayer($login);
 
+		// Trigger own callback
+		$this->maniaControl->callbackManager->triggerCallback(self::CB_PLAYERDISCONNECTED, array(self::CB_PLAYERDISCONNECTED, $player));
+
 		if($player->isFakePlayer())
 			return;