diff --git a/application/core/Players/Player.php b/application/core/Players/Player.php
index 000ee84d..b8cb84b4 100644
--- a/application/core/Players/Player.php
+++ b/application/core/Players/Player.php
@@ -59,6 +59,9 @@ class Player {
 		$this->ipAddress = $rpcInfos['IPAddress'];
 		
 		$this->joinTime = time();
+
+		if($this->nickname == '')
+			$this->nickname = $this->login;
 	}
 
 	/**