diff --git a/jGui b/jGui
index 589f6ca4..038de142 160000
--- a/jGui
+++ b/jGui
@@ -1 +1 @@
-Subproject commit 589f6ca43dd35431281d1d307e22b8d66019c830
+Subproject commit 038de142e41c48e6d77e2bc965667eb8fc04a470
diff --git a/src/main/java/com/replaymod/online/gui/GuiLoginPrompt.java b/src/main/java/com/replaymod/online/gui/GuiLoginPrompt.java
index ac5121ef..8dcf459d 100755
--- a/src/main/java/com/replaymod/online/gui/GuiLoginPrompt.java
+++ b/src/main/java/com/replaymod/online/gui/GuiLoginPrompt.java
@@ -9,6 +9,7 @@ import de.johni0702.minecraft.gui.element.GuiPasswordField;
 import de.johni0702.minecraft.gui.element.GuiTextField;
 import de.johni0702.minecraft.gui.layout.CustomLayout;
 import de.johni0702.minecraft.gui.utils.Consumer;
+import de.johni0702.minecraft.gui.utils.Utils;
 import eu.crushedpixel.replaymod.gui.GuiConstants;
 
 public class GuiLoginPrompt extends AbstractGuiScreen<GuiLoginPrompt> {
@@ -24,9 +25,13 @@ public class GuiLoginPrompt extends AbstractGuiScreen<GuiLoginPrompt> {
     private GuiButton cancelButton = new GuiButton(this).setI18nLabel("replaymod.gui.cancel").setSize(150, 20);
     private GuiButton registerButton = new GuiButton(this).setI18nLabel("replaymod.gui.register").setSize(150, 20);
     private GuiTextField username = new GuiTextField(this).setSize(145, 20).setMaxLength(16).setFocused(true);
-    private GuiPasswordField password = new GuiPasswordField(this).setSize(145, 20).setNext(username).setPrevious(username)
+    private GuiPasswordField password = new GuiPasswordField(this).setSize(145, 20)
             .setMaxLength(GuiConstants.MAX_PW_LENGTH);
 
+    {
+        Utils.link(username, password);
+    }
+
     {
         Runnable doLogin = new Runnable() {
             @Override
diff --git a/src/main/java/com/replaymod/online/gui/GuiRegister.java b/src/main/java/com/replaymod/online/gui/GuiRegister.java
index 223e40d2..6bc81f17 100644
--- a/src/main/java/com/replaymod/online/gui/GuiRegister.java
+++ b/src/main/java/com/replaymod/online/gui/GuiRegister.java
@@ -10,6 +10,7 @@ import de.johni0702.minecraft.gui.layout.CustomLayout;
 import de.johni0702.minecraft.gui.layout.HorizontalLayout;
 import de.johni0702.minecraft.gui.layout.VerticalLayout;
 import de.johni0702.minecraft.gui.utils.Consumers;
+import de.johni0702.minecraft.gui.utils.Utils;
 import eu.crushedpixel.replaymod.gui.GuiConstants;
 import eu.crushedpixel.replaymod.utils.EmailAddressUtils;
 import eu.crushedpixel.replaymod.utils.RegexUtils;
@@ -43,10 +44,7 @@ public class GuiRegister extends AbstractGuiScreen<GuiRegister> {
                         .addElements(data, new GuiLabel().setI18nText("replaymod.gui.register.confirmpw"))
                         .addElements(data, passwordConfirmation = new GuiPasswordField().setMaxLength(GuiConstants.MAX_PW_LENGTH+1).setSize(145, 20))
         );
-        usernameInput.setNext(mailInput)
-                .getNext().setNext(passwordInput)
-                .getNext().setNext(passwordConfirmation)
-                .getNext().setNext(usernameInput);
+        Utils.link(usernameInput, mailInput, passwordInput, passwordConfirmation);
 
         setLayout(new CustomLayout<GuiRegister>() {
             @Override