diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
index 4715cda5..b1983be7 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -84,6 +84,11 @@ public class ServerConnector extends PacketHandler
             }
         }
 
+        for ( PacketFAPluginMessage message : user.getPendingConnection().getLoginMessages() )
+        {
+            ch.write( message );
+        }
+
         if ( user.getSettings() != null )
         {
             ch.write( user.getSettings() );
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index ebdd57dc..4ee67579 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -53,6 +53,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
     @Getter
     private Packet2Handshake handshake;
     private PacketFDEncryptionRequest request;
+    @Getter
     private List<PacketFAPluginMessage> loginMessages = new ArrayList<>();
     private State thisState = State.HANDSHAKE;
     private SecretKey sharedKey;