diff --git a/application/core/Manialinks/CustomUIManager.php b/application/core/Manialinks/CustomUIManager.php
index a11f5d47..0f7d046e 100644
--- a/application/core/Manialinks/CustomUIManager.php
+++ b/application/core/Manialinks/CustomUIManager.php
@@ -55,12 +55,11 @@ class CustomUIManager implements CallbackListener, TimerListener {
 	 * @param Player $player
 	 */
 	private function updateManialink(Player $player = null) {
-		$manialinkText = $this->customUI->render()->saveXML();
 		if ($player) {
-			$this->maniaControl->manialinkManager->sendManialink($manialinkText, $player->login);
+			$this->maniaControl->manialinkManager->sendManialink($this->customUI, $player->login);
 			return;
 		}
-		$this->maniaControl->manialinkManager->sendManialink($manialinkText);
+		$this->maniaControl->manialinkManager->sendManialink($this->customUI);
 	}
 
 	/**
@@ -83,6 +82,10 @@ class CustomUIManager implements CallbackListener, TimerListener {
 	 */
 	public function handlePlayerJoined(Player $player) {
 		$this->updateManialink($player);
+		//send it again after 5 secs
+		$this->maniaControl->timerManager->registerOneTimeListening($this, function($time) use (&$player){
+			$this->updateManialink($player);
+		},5000);
 	}
 
 	/**
diff --git a/application/plugins/Dedimania/Dedimania.php b/application/plugins/Dedimania/Dedimania.php
index d40b65ba..12e048f5 100644
--- a/application/plugins/Dedimania/Dedimania.php
+++ b/application/plugins/Dedimania/Dedimania.php
@@ -202,6 +202,9 @@ class Dedimania implements CallbackListener, TimerListener, Plugin {
 							$this->fetchDedimaniaRecords(true);
 						}
 					}
+
+					$manialink = $this->buildManialink();
+					$this->maniaControl->manialinkManager->sendManialink($manialink, $player->login);
 				}
 			} else {
 				if (!$data) {
@@ -209,10 +212,6 @@ class Dedimania implements CallbackListener, TimerListener, Plugin {
 					var_dump($data);
 				}
 			}
-
-			$manialink = $this->buildManialink();
-			$this->maniaControl->manialinkManager->sendManialink($manialink, $player->login);
-
 			return true;
 		}, $content, true);
 	}