diff --git a/pom.xml b/pom.xml
index df1056e91b..27cf01b527 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,9 @@
         <developer>
             <id>Zartec</id>
         </developer>
+        <developer>
+            <id>ghac</id>
+        </developer>
     </developers>
 
     <modules>
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 5eea7b4f3f..6f9f2fbf9c 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -240,6 +240,7 @@ public ServerInfo updateAndGetNextServer(ServerInfo currentTarget)
             if ( !Objects.equal( currentTarget, candidate ) )
             {
                 next = candidate;
+                break;
             }
         }