diff --git a/server/game/net/connection.js b/server/game/net/connection.js
index 8b7f831..d1866c8 100644
--- a/server/game/net/connection.js
+++ b/server/game/net/connection.js
@@ -9,6 +9,7 @@ class Connection {
 		this.connections = net.connections;
 		this.io = net.io;
 		this.socket = socket;
+		this.ip = socket.request.connection.remoteAddress;
 
 		this.player = new Player(this);
 		this._room = false;
diff --git a/server/game/room/index.js b/server/game/room/index.js
index ec022fb..8f76349 100644
--- a/server/game/room/index.js
+++ b/server/game/room/index.js
@@ -35,7 +35,7 @@ class Room {
 		this.setTeam(player, this.teamA.size > this.teamB.size ? 'b' : 'a');
 		this.world.addPlayer(player);
 		this.sendWorld(player);
-		wingbase.log(`${player.name} joined ${this.name}.`);
+		wingbase.log(`[${player.connection.ip}] ${player.name} joined ${this.name}.`);
 		this.message('roomEnter', player.name, 'team' + player.team);
 	}