diff --git a/note_kfet/templates/registration/login.html b/note_kfet/templates/registration/login.html
index 554a37d8..027c629d 100644
--- a/note_kfet/templates/registration/login.html
+++ b/note_kfet/templates/registration/login.html
@@ -3,8 +3,6 @@
 SPDX-License-Identifier: GPL-2.0-or-later
 {% endcomment %}
 {% load i18n crispy_forms_tags static %}
-
-{# Change page title without displaying it in header #}
 {% block title %}{% trans "Log in" %}{% endblock %}
 {% block contenttitle %}{% endblock %}
 
@@ -13,34 +11,35 @@ SPDX-License-Identifier: GPL-2.0-or-later
 {% endblock %}
 
 {% block content %}
-    <main class="card bg-light border-dark mx-auto" style="max-width: 30rem;">
-        <h3 class="card-header text-center">
-            {% trans "Log in" %}
-        </h3>
-        <div class="card-body">
-            {% if user.is_authenticated %}
-                <div class="alert alert-warning">
-                    {% blocktrans trimmed with username=request.user.username %}
-                        You are authenticated as {{ username }}, but are not authorized to
-                        access this page. Would you like to login to a different account,
-                        or with a higher permission mask?
-                    {% endblocktrans %}
-                </div>
-            {% endif %}
-
-            {% if request.resolver_match.view_name == 'admin:login' %}
-                <div class="alert alert-info">
-                    {% blocktrans trimmed %}
-                        You must be logged with a staff account with the higher mask to access Django Admin.
-                    {% endblocktrans %}
-                </div>
-            {% endif %}
-
-            <form action="{{ app_path }}" method="post" id="login-form">{% csrf_token %}
-                {{ form | crispy }}
-                <input type="submit" value="{% trans 'Log in' %}" class="btn btn-primary btn-block btn-lg">
-                <a href="{% url 'password_reset' %}" class="badge badge-light">{% trans 'Forgotten your password or username?' %}</a>
-            </form>
+<div class="card bg-light mx-auto" style="max-width: 30rem;">
+    <h3 class="card-header text-center">
+        {% trans "Log in" %}
+    </h3>
+    <div class="card-body">
+        {% if user.is_authenticated %}
+        <div class="alert alert-warning">
+            {% blocktrans trimmed with username=request.user.username %}
+            You are authenticated as {{ username }}, but are not authorized to
+            access this page. Would you like to login to a different account,
+            or with a higher permission mask?
+            {% endblocktrans %}
         </div>
-    </main>
-{% endblock %}
+        {% endif %}
+
+        {% if request.resolver_match.view_name == 'admin:login' %}
+        <div class="alert alert-info">
+            {% blocktrans trimmed %}
+            You must be logged with a staff account with the higher mask to access Django Admin.
+            {% endblocktrans %}
+        </div>
+        {% endif %}
+
+        <form action="{{ app_path }}" method="post" id="login-form">{% csrf_token %}
+            {{ form | crispy }}
+            <input type="submit" value="{% trans 'Log in' %}" class="btn btn-primary btn-block btn-lg">
+            <a href="{% url 'password_reset' %}"
+                class="badge badge-light">{% trans 'Forgotten your password or username?' %}</a>
+        </form>
+    </div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/note_kfet/templates/registration/password_reset_form.html b/note_kfet/templates/registration/password_reset_form.html
index 61adaa92..e184ae2c 100644
--- a/note_kfet/templates/registration/password_reset_form.html
+++ b/note_kfet/templates/registration/password_reset_form.html
@@ -3,11 +3,21 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n crispy_forms_tags %}
+{% block contenttitle %}{% endblock %}
 
 {% block content %}
-    <p>{% trans "Forgotten your password? Enter your email address below, and we'll email instructions for setting a new one." %}</p>
-    <form method="post">{% csrf_token %}
-        {{ form | crispy }}
-        <input class="btn btn-primary" type="submit" value="{% trans 'Reset my password' %}">
-    </form>
+<div class="card bg-light">
+    <h3 class="card-header text-center">
+        {% trans "Password reset" %}
+    </h3>
+    <div class="card-body">
+        <p>{% trans "Forgotten your password? Enter your email address below, and we'll email instructions for setting a new one." %}</p>
+
+        <form method="post">
+            {% csrf_token %}
+            {{ form | crispy }}
+            <input class="btn btn-primary" type="submit" value="{% trans 'Reset my password' %}">
+        </form>
+    </div>
+</div>
 {% endblock %}
diff --git a/note_kfet/templates/registration/signup.html b/note_kfet/templates/registration/signup.html
index 31134d73..bde985a6 100644
--- a/note_kfet/templates/registration/signup.html
+++ b/note_kfet/templates/registration/signup.html
@@ -1,23 +1,33 @@
-<!-- templates/signup.html -->
 {% extends 'base.html' %}
-{% load crispy_forms_tags %}
-{% load i18n %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags %}
 {% block title %}{% trans "Sign up" %}{% endblock %}
-
-{# Use a fixed-width container #}
-{% block containertype %}container{% endblock %}
+{% block contenttitle %}{% endblock %}
 
 {% block content %}
-    <div class="alert alert-warning">
-        {% blocktrans %}If you already signed up, your registration is taken into account. The BDE must validate your account before your can log in. You have to go to the Kfet and pay the registration fee. You must also validate your email address by following the link you received.{% endblocktrans %}
-    </div>
+<div class="card bg-light">
+    <h3 class="card-header text-center">
+        {% trans "Sign up" %}
+    </h3>
+    <div class="card-body">
+        <div class="alert alert-warning">
+            {% blocktrans trimmed %}
+            If you already signed up, your registration is taken into account. The BDE must validate
+            your account before your can log in. You have to go to the Kfet and pay the registration fee. You must also
+            validate your email address by following the link you received.
+            {% endblocktrans %}
+        </div>
 
-    <form method="post">
-        {% csrf_token %}
-        {{ form|crispy }}
-        {{ profile_form|crispy }}
-        <button class="btn btn-success" type="submit">
-            {% trans "Sign up" %}
-        </button>
-    </form>
-{% endblock %}
+        <form method="post">
+            {% csrf_token %}
+            {{ form|crispy }}
+            {{ profile_form|crispy }}
+            <button class="btn btn-success" type="submit">
+                {% trans "Sign up" %}
+            </button>
+        </form>
+    </div>
+</div>
+{% endblock %}
\ No newline at end of file