diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
index 1bb77a9b4b..2a96168eac 100644
--- a/src/main/java/net/minecraft/server/PendingConnection.java
+++ b/src/main/java/net/minecraft/server/PendingConnection.java
@@ -65,6 +65,7 @@ public class PendingConnection extends Connection {
         if (this.g != null) {
             this.disconnect("Quit repeating yourself!");
         } else {
+            this.hostname = packet2handshake.c + ':' + packet2handshake.d; // CraftBukkit - initialize field
             this.g = packet2handshake.f();
             if (!this.g.equals(StripColor.a(this.g))) {
                 this.disconnect("Invalid username!");