diff --git a/html/account-linking.html b/html/account-linking.html
new file mode 100644
index 0000000..0fcaf66
--- /dev/null
+++ b/html/account-linking.html
@@ -0,0 +1,49 @@
+{{ if .discordEnabled }}
+<div id="modal-discord" class="modal">
+    <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3">
+        <span class="heading mb-4">{{ .strings.linkDiscord }}</span>
+        <p class="content mb-4"> {{ .discordSendPINMessage }}</p>
+        <h1 class="text-center text-2xl mb-2 pin"></h1>
+        <div class="row center">
+            <a id="discord-invite" class="my-5 hover:underline"></a>
+        </div>
+        <span class="button ~info @low full-width center mt-4" id="discord-waiting">{{ .strings.success }}</span>
+    </div>
+</div>
+{{ end }}
+{{ if .telegramEnabled }}
+<div id="modal-telegram" class="modal">
+    <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3">
+        <span class="heading mb-4">{{ .strings.linkTelegram }}</span>
+        <p class="content mb-4">{{ .strings.sendPIN }}</p>
+        <p class="text-center text-2xl mb-2">{{ .telegramPIN }}</p>
+        <a class="subheading link-center" href="{{ .telegramURL }}" target="_blank">
+            <span class="shield ~info mr-4">
+                <span class="icon">
+                    <i class="ri-telegram-line"></i>
+                </span>
+            </span>
+            &#64;{{ .telegramUsername }}
+        </a>
+        <span class="button ~info @low full-width center mt-4" id="telegram-waiting">{{ .strings.success }}</span>
+    </div>
+</div>
+{{ end }}
+{{ if .matrixEnabled }}
+<div id="modal-matrix" class="modal">
+    <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3">
+        <span class="heading mb-4">{{ .strings.linkMatrix }}</span>
+        <p class="content mb-4"> {{ .strings.matrixEnterUser }}</p>
+        <input type="text" class="input ~neutral @high" placeholder="@user:riot.im" id="matrix-userid">
+        <div class="subheading link-center mt-4">
+            <span class="shield ~info mr-4">
+                <span class="icon">
+                    <i class="ri-chat-3-line"></i>
+                </span>
+            </span>
+            {{ .matrixUser }}
+        </div>
+        <span class="button ~info @low full-width center mt-4" id="matrix-send">{{ .strings.submit }}</span>
+    </div>
+</div>
+{{ end }}
diff --git a/html/form.html b/html/form.html
index 1ef1820..ef2b888 100644
--- a/html/form.html
+++ b/html/form.html
@@ -26,53 +26,7 @@
                 <p class="content mb-4">{{ .strings.confirmationRequiredMessage }}</p>
             </div>
         </div>
-        {{ if .telegramEnabled }}
-        <div id="modal-telegram" class="modal">
-            <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3">
-                <span class="heading mb-4">{{ .strings.linkTelegram }}</span>
-                <p class="content mb-4">{{ .strings.sendPIN }}</p>
-                <p class="text-center text-2xl mb-2">{{ .telegramPIN }}</p>
-                <a class="subheading link-center" href="{{ .telegramURL }}" target="_blank">
-                    <span class="shield ~info mr-4">
-                        <span class="icon">
-                            <i class="ri-telegram-line"></i>
-                        </span>
-                    </span>
-                    &#64;{{ .telegramUsername }}
-                </a>
-                <span class="button ~info @low full-width center mt-4" id="telegram-waiting">{{ .strings.success }}</span>
-            </div>
-        </div>
-        {{ end }}
-        {{ if .discordEnabled }}
-        <div id="modal-discord" class="modal">
-            <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3">
-                <span class="heading mb-4">{{ .strings.linkDiscord }}</span>
-                <p class="content mb-4"> {{ .discordSendPINMessage }}</p>
-                <h1 class="text-center text-2xl mb-2 pin"></h1>
-                <a id="discord-invite"></a>
-                <span class="button ~info @low full-width center mt-4" id="discord-waiting">{{ .strings.success }}</span>
-            </div>
-        </div>
-        {{ end }}
-        {{ if .matrixEnabled }}
-        <div id="modal-matrix" class="modal">
-            <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3">
-                <span class="heading mb-4">{{ .strings.linkMatrix }}</span>
-                <p class="content mb-4"> {{ .strings.matrixEnterUser }}</p>
-                <input type="text" class="input ~neutral @high" placeholder="@user:riot.im" id="matrix-userid">
-                <div class="subheading link-center mt-4">
-                    <span class="shield ~info mr-4">
-                        <span class="icon">
-                            <i class="ri-chat-3-line"></i>
-                        </span>
-                    </span>
-                    {{ .matrixUser }}
-                </div>
-                <span class="button ~info @low full-width center mt-4" id="matrix-send">{{ .strings.submit }}</span>
-            </div>
-        </div>
-        {{ end }}
+        {{ template "account-linking.html" . }}
         <div class="top-4 left-4 absolute">
             <span class="dropdown" tabindex="0" id="lang-dropdown">
                 <span class="button ~urge dropdown-button">
diff --git a/html/user.html b/html/user.html
index 3de47a7..5135c2e 100644
--- a/html/user.html
+++ b/html/user.html
@@ -41,49 +41,7 @@
                 </div>
             </div>
         </div>
-        <div id="modal-discord" class="modal">
-            <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3">
-                <span class="heading mb-4">{{ .strings.linkDiscord }}</span>
-                <p class="content mb-4"> {{ .discordSendPINMessage }}</p>
-                <h1 class="text-center text-2xl mb-2 pin"></h1>
-                <div class="row center">
-                    <a id="discord-invite"></a>
-                </div>
-                <span class="button ~info @low full-width center mt-4" id="discord-waiting">{{ .strings.success }}</span>
-            </div>
-        </div>
-        <div id="modal-telegram" class="modal">
-            <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3">
-                <span class="heading mb-4">{{ .strings.linkTelegram }}</span>
-                <p class="content mb-4">{{ .strings.sendPIN }}</p>
-                <p class="text-center text-2xl mb-2">{{ .telegramPIN }}</p>
-                <a class="subheading link-center" href="{{ .telegramURL }}" target="_blank">
-                    <span class="shield ~info mr-4">
-                        <span class="icon">
-                            <i class="ri-telegram-line"></i>
-                        </span>
-                    </span>
-                    &#64;{{ .telegramUsername }}
-                </a>
-                <span class="button ~info @low full-width center mt-4" id="telegram-waiting">{{ .strings.success }}</span>
-            </div>
-        </div>
-        <div id="modal-matrix" class="modal">
-            <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3">
-                <span class="heading mb-4">{{ .strings.linkMatrix }}</span>
-                <p class="content mb-4"> {{ .strings.matrixEnterUser }}</p>
-                <input type="text" class="input ~neutral @high" placeholder="@user:riot.im" id="matrix-userid">
-                <div class="subheading link-center mt-4">
-                    <span class="shield ~info mr-4">
-                        <span class="icon">
-                            <i class="ri-chat-3-line"></i>
-                        </span>
-                    </span>
-                    {{ .matrixUser }}
-                </div>
-                <span class="button ~info @low full-width center mt-4" id="matrix-send">{{ .strings.submit }}</span>
-            </div>
-        </div>
+        {{ template "account-linking.html" . }}
         <div id="notification-box"></div>
         <div class="top-4 left-4 absolute">
             <span class="dropdown" tabindex="0" id="lang-dropdown">
diff --git a/lang/form/en-us.json b/lang/form/en-us.json
index 715d0d3..1e132b3 100644
--- a/lang/form/en-us.json
+++ b/lang/form/en-us.json
@@ -20,7 +20,8 @@
         "sendPIN": "Send the PIN below to the bot, then come back here to link your account.",
         "sendPINDiscord": "Type {command} in {server_channel} on Discord, then send the PIN below.",
         "matrixEnterUser": "Enter your User ID, press submit, and a PIN will be sent to you. Enter it here to continue.",
-        "welcomeUser": "Welcome, {user}!"
+        "welcomeUser": "Welcome, {user}!",
+        "joinTheServer": "Join the server:"
     },
     "notifications": {
         "errorUserExists": "User already exists.",
diff --git a/ts/modules/account-linking.ts b/ts/modules/account-linking.ts
index 76e34c5..5902732 100644
--- a/ts/modules/account-linking.ts
+++ b/ts/modules/account-linking.ts
@@ -75,13 +75,15 @@ export class Discord {
         const link = document.getElementById("discord-invite") as HTMLAnchorElement;
         link.href = inv.invite;
         link.target = "_blank";
+        let innerHTML = `<span class="mr-2">${window.lang.strings("joinTheServer")}</span>`;
         if (inv.icon != "") {
-            link.innerHTML = `<span class="img-circle lg mr-4"><img class="img-circle" src="${inv.icon}" width="64" height="64"></span>${window.discordServerName}`;
+            innerHTML += `<span class="img-circle lg mr-4"><img class="img-circle" src="${inv.icon}" width="64" height="64"></span>${window.discordServerName}`;
         } else {
-            link.innerHTML = `
+            innerHTML += `
             <span class="shield mr-4 bg-discord"><i class="ri-discord-fill ri-xl text-white"></i></span>${window.discordServerName}
             `;
         }
+        link.innerHTML = innerHTML;
     });
 
     private _checkVerified = () => {
diff --git a/ts/user.ts b/ts/user.ts
index 465dfd9..340f7e5 100644
--- a/ts/user.ts
+++ b/ts/user.ts
@@ -35,9 +35,15 @@ window.modals = {} as Modals;
 (() => {
     window.modals.login = new Modal(document.getElementById("modal-login"), true);
     window.modals.email = new Modal(document.getElementById("modal-email"), false);
-    window.modals.discord = new Modal(document.getElementById("modal-discord"), false);
-    window.modals.telegram = new Modal(document.getElementById("modal-telegram"), false);
-    window.modals.matrix = new Modal(document.getElementById("modal-matrix"), false);
+    if (window.discordEnabled) {
+        window.modals.discord = new Modal(document.getElementById("modal-discord"), false);
+    }
+    if (window.telegramEnabled) {
+        window.modals.telegram = new Modal(document.getElementById("modal-telegram"), false);
+    }
+    if (window.matrixEnabled) {
+        window.modals.matrix = new Modal(document.getElementById("modal-matrix"), false);
+    }
 })();
 
 window.notifications = new notificationBox(document.getElementById('notification-box') as HTMLDivElement, 5);