diff --git a/src/org/apollo/game/model/World.java b/src/org/apollo/game/model/World.java
index d3d1ed69..9afaf04f 100644
--- a/src/org/apollo/game/model/World.java
+++ b/src/org/apollo/game/model/World.java
@@ -322,12 +322,14 @@ public final class World {
 	 * @return A {@link RegistrationStatus}.
 	 */
 	public RegistrationStatus register(final Player player) {
-		if (isPlayerOnline(player.getUsername())) {
+		String username = player.getUsername();
+		if (isPlayerOnline(username)) {
 			return RegistrationStatus.ALREADY_ONLINE;
 		}
 
 		boolean success = playerRepository.add(player);
 		if (success) {
+			players.put(NameUtil.encodeBase37(username), player);
 			Sector sector = sectorRepository.fromPosition(player.getPosition());
 			sector.addEntity(player);