diff --git a/resources/index.html b/resources/index.html
index 71ce073..ea5ffcd 100644
--- a/resources/index.html
+++ b/resources/index.html
@@ -59,7 +59,7 @@
         </div>
         <div id="loginPopupContentBodyBtns">
           <button class="playBtn" id="loginPopupContentBodyBtnLogin" onclick="login()">Login</button>
-          <button class="altBtn" id="loginPopupContentBodyBtnRegister" onclick="register()">Register</button>
+          <button class="altBtn" id="loginPopupContentBodyBtnRegister" onclick="setRegisterSection(true)">Register</button>
         </div>
         <div>
           <button class="altBtn" id="noLoginBtn" onclick="(() => { launchPrivate(); closeLogin()})()">
diff --git a/resources/js/login.js b/resources/js/login.js
index babbc15..39ec7ce 100644
--- a/resources/js/login.js
+++ b/resources/js/login.js
@@ -17,7 +17,7 @@ async function setLoginSection() {
 /**
  * Toggle the register section
  */
-async function setRegisterSection() {
+async function setRegisterSection(fromLogin = false) {
   const title = document.getElementById('registerSectionTitle');
   const altTitle = document.getElementById('loginSectionTitle');
   const loginSection = document.getElementById('loginPopupContentBody');
@@ -28,6 +28,15 @@ async function setRegisterSection() {
 
   loginSection.style.display = 'none';
   registerSection.style.removeProperty('display');
+
+  if (fromLogin) {
+    // Take the values from the login section and put them in the register section
+    const loginUsername = document.getElementById('loginUsername').value;
+    const loginPassword = document.getElementById('loginPassword').value;
+
+    document.getElementById('registerUsername').value = loginUsername;
+    document.getElementById('registerPassword').value = loginPassword;
+  }
 }
 
 /**