diff --git a/allianceauth/services/modules/mumble/templates/services/mumble/base.html b/allianceauth/services/modules/mumble/templates/services/mumble/base.html
index 590da6fa..2ed5a3c3 100644
--- a/allianceauth/services/modules/mumble/templates/services/mumble/base.html
+++ b/allianceauth/services/modules/mumble/templates/services/mumble/base.html
@@ -16,4 +16,4 @@
             {% block mumble %}{% endblock mumble %}
         </div>
     </div>
-{% endblock %}
+{% endblock content %}
diff --git a/allianceauth/services/modules/mumble/templates/services/mumble/link.html b/allianceauth/services/modules/mumble/templates/services/mumble/templinks/link_sso.html
similarity index 84%
rename from allianceauth/services/modules/mumble/templates/services/mumble/link.html
rename to allianceauth/services/modules/mumble/templates/services/mumble/templinks/link_sso.html
index 55db3fe5..33787202 100644
--- a/allianceauth/services/modules/mumble/templates/services/mumble/link.html
+++ b/allianceauth/services/modules/mumble/templates/services/mumble/templinks/link_sso.html
@@ -6,20 +6,20 @@
 {% block mumble %}
     <div class="text-center">
         <p>
-            <img class="ra-avatar img-circle" src="{{ link.creator.portrait_url_128 }}" alt="{{ link.creator.character_name }}" />
+            <img class="ra-avatar img-circle" src="{{ temp_user.templink.creator.portrait_url_128 }}" alt="{{ temp_user.templink.creator.character_name }}" />
         </p>
 
         <h4>
-            {% blocktranslatelate with character=link.creator.character_name %}
+            {% blocktranslate with character=temp_user.templink.creator.character_name %}
                 {{ character }} has invited you to join Mumble!
-            {% endblocktranslatelate %}
+            {% endblocktranslate %}
         </h4>
 
         <p>
-            {% translate "Time Remaining" %}: <span id="countdown{{ link.link_ref }}"></span>
+            {% translate "Time Remaining" %}: <span id="countdown{{ temp_user.templink.link_ref }}"></span>
         </p>
         <p>
-            <span class="label label-info">{% translate "Link Ref" %}: {{ link.link_ref }}</span>
+            <span class="label label-info">{% translate "Link Ref" %}: {{ temp_user.templink.link_ref }}</span>
         </p>
 
         <p>
@@ -27,7 +27,7 @@
                 <img src="{% static 'services/mumble/images/mumble-icon.png' %}" alt="{% translate 'Mumble' %}" height="64" width="64" style="margin: 15px" />
 
                 <span style="margin: 15px;">
-                    {% translate "Click to Join Mumble as" %}: <b>{{ temp_user.name }}</b>
+                    {% translate "Click to Join Mumble as" %}: <b>{{ temp_user.display_name }}</b>
                 </span>
             </a>
         </p>
@@ -44,13 +44,13 @@
                             {% translate "If you have problems with the application link above, please use the following in Mumble's connection dialog." %}
                         </p>
                         <p>
-                            {% translate "Mumble URL" %}: <span class="badge bg-dark">{{ mumble }}</span>
+                            {% translate "Mumble URL" %}: <span class="badge bg-dark">{{ mumble_url }}</span>
                         </p>
                         <p>
                             {% translate "Username" %}: <span class="badge bg-dark">{{ temp_user.username }}</span>
                         </p>
                         <p>
-                            {% translate "Password" %}: <span class="badge bg-dark">{{ temp_user.password }}</span>
+                            {% translate "Password" %}: <span class="badge bg-dark">{{ password }}</span>
                         </p>
                     </div>
                 </div>
@@ -65,8 +65,8 @@
         /* global moment */
         const locale = '{{ LANGUAGE_CODE }}';
         const timers = [{
-            'id': '{{ link.link_ref }}',
-            'targetDate': moment('{{ link.expires| date:"c" }}'),
+            'id': '{{ temp_user.templink.link_ref }}',
+            'targetDate': moment('{{ temp_user.templink.expires| date:"c" }}'),
             'expired': false
         }];
 
diff --git a/allianceauth/services/modules/mumble/templates/services/mumble/login.html b/allianceauth/services/modules/mumble/templates/services/mumble/templinks/login.html
similarity index 56%
rename from allianceauth/services/modules/mumble/templates/services/mumble/login.html
rename to allianceauth/services/modules/mumble/templates/services/mumble/templinks/login.html
index a327ced9..f8e0ccdd 100644
--- a/allianceauth/services/modules/mumble/templates/services/mumble/login.html
+++ b/allianceauth/services/modules/mumble/templates/services/mumble/templinks/login.html
@@ -11,9 +11,9 @@
             </p>
 
             <h4>
-                {% blocktranslatelate with character=link.creator.character_name %}
+                {% blocktranslate with character=link.creator.character_name %}
                     {{ character }} has invited you to join Mumble!
-                {% endblocktranslatelate %}
+                {% endblocktranslate %}
             </h4>
 
             <p>
@@ -35,46 +35,6 @@
                     >
                 </form>
             </div>
-
-            <div class="mumble-non-sso-login">
-                <div class="row justify-content-center">
-                    <div class="col-md-10 col-lg-8">
-                        <div class="card">
-                            <div class="card-header text-center">
-                                <div class="card-title mb-0">{% translate "Non SSO Login" %}</div>
-                            </div>
-
-                            <div class="card-body text-start">
-                                <div class="form-group">
-                                    <form action="{% url 'mumble:join' link.link_ref %}" method="post">
-                                        {% csrf_token %}
-
-                                        <input type="hidden" name="sso" value="False" />
-
-                                        <p class="text-center">
-                                            {% translate "If you cannot SSO with your EVE character, You can enter your own details below." %}
-                                        </p>
-
-                                        <p>
-                                            <label for="name">{% translate "Name" %}</label>
-                                            <input type="text" class="form-control" name="name" id="name" placeholder="{% translate 'Who are you?' %}" />
-                                        </p>
-
-                                        <p>
-                                            <label for="association">{% translate "Association" %}</label>
-                                            <input type="text" class="form-control" name="association" id="association" placeholder="{% translate 'Who are you with?' %}" />
-                                        </p>
-
-                                        <button type="submit" value="{% translate 'Submit' %}" class="btn btn-primary">
-                                            {% translate "Login Without SSO" %}
-                                        </button>
-                                    </form>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
         </div>
 
         {% include "bundles/moment-js.html" with locale=True %}
diff --git a/allianceauth/services/modules/mumble/templates/services/mumble/templinks.html b/allianceauth/services/modules/mumble/templates/services/mumble/templinks/templinks.html
similarity index 99%
rename from allianceauth/services/modules/mumble/templates/services/mumble/templinks.html
rename to allianceauth/services/modules/mumble/templates/services/mumble/templinks/templinks.html
index 0da8824e..99e395a0 100644
--- a/allianceauth/services/modules/mumble/templates/services/mumble/templinks.html
+++ b/allianceauth/services/modules/mumble/templates/services/mumble/templinks/templinks.html
@@ -48,7 +48,7 @@
             <div class="card-body text-center">
                 <p>{% translate "Your link will be displayed on the next page for an easy copy and paste." %}</p>
 
-                <form action="{% url 'mumble:index' %}" method="post">
+                <form action="{% url 'mumble:templinks' %}" method="post">
                     {% csrf_token %}
 
                     <div class="mb-3">
diff --git a/allianceauth/templates/bundles/moment-js.html b/allianceauth/templates/bundles/moment-js.html
index c1d55df4..3ddbb030 100644
--- a/allianceauth/templates/bundles/moment-js.html
+++ b/allianceauth/templates/bundles/moment-js.html
@@ -1,7 +1,7 @@
 {% load aa_i18n %}
 
 <!-- Start Moment.js from cdnjs -->
-<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.30.1/moment.min.js" integrity="sha512-hUhvpC5f8cgc04OZb55j0KNGh4eh7dLxd/dPSJ5VyzqDWxsayYbojWyl5Tkcgrmb/RVKCRJI1jNlRbVP4WWC4w==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.30.1/moment.min.js" integrity="sha512-QoJS4DOhdmG8kbbHkxmB/rtPdN62cGWXAdAFWWJPvUFF1/zxcPSdAnn4HhYZSIlVoLVEJ0LesfNlusgm2bPfnA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 
 {% if locale and LANGUAGE_CODE != 'en' %}
     <!-- Moment.JS Not EN-en ({{ LANGUAGE_CODE }}) -->