diff --git a/apps/member/templates/member/club_form.html b/apps/member/templates/member/club_form.html
index 9810ccab..fc4e79e3 100644
--- a/apps/member/templates/member/club_form.html
+++ b/apps/member/templates/member/club_form.html
@@ -1,33 +1,43 @@
 {% extends "base.html" %}
-{% load static %}
-{% load i18n %}
-{% load crispy_forms_tags %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags %}
+{% block contenttitle %}{% endblock %}
+
 {% block content %}
-<form method="post">
-{% csrf_token %}
-{{form|crispy}}
-<button class="btn btn-primary" type="submit">{% trans "Submit" %}</button>
-</form>
+<div class="card bg-light">
+    <h3 class="card-header text-center">
+        {{ title }}
+    </h3>
+    <div class="card-body">
+        <form method="post">
+            {% csrf_token %}
+            {{ form|crispy }}
+            <button class="btn btn-primary" type="submit">{% trans "Submit" %}</button>
+        </form>
+    </div>
+</div>
 {% endblock %}
 
 {% block extrajavascript %}
-    <script>
-        require_memberships_obj = $("#id_require_memberships");
+<script>
+    require_memberships_obj = $("#id_require_memberships");
 
-        if (!require_memberships_obj.is(":checked")) {
-            $("#div_id_membership_fee_paid").toggle();
-            $("#div_id_membership_fee_unpaid").toggle();
-            $("#div_id_membership_duration").toggle();
-            $("#div_id_membership_start").toggle();
-            $("#div_id_membership_end").toggle();
-        }
+    if (!require_memberships_obj.is(":checked")) {
+        $("#div_id_membership_fee_paid").toggle();
+        $("#div_id_membership_fee_unpaid").toggle();
+        $("#div_id_membership_duration").toggle();
+        $("#div_id_membership_start").toggle();
+        $("#div_id_membership_end").toggle();
+    }
 
-        require_memberships_obj.change(function () {
-            $("#div_id_membership_fee_paid").toggle();
-            $("#div_id_membership_fee_unpaid").toggle();
-            $("#div_id_membership_duration").toggle();
-            $("#div_id_membership_start").toggle();
-            $("#div_id_membership_end").toggle();
-        });
-    </script>
-{% endblock %}
+    require_memberships_obj.change(function () {
+        $("#div_id_membership_fee_paid").toggle();
+        $("#div_id_membership_fee_unpaid").toggle();
+        $("#div_id_membership_duration").toggle();
+        $("#div_id_membership_start").toggle();
+        $("#div_id_membership_end").toggle();
+    });
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/apps/registration/templates/registration/future_user_list.html b/apps/registration/templates/registration/future_user_list.html
index c2c888fd..aa0b05e5 100644
--- a/apps/registration/templates/registration/future_user_list.html
+++ b/apps/registration/templates/registration/future_user_list.html
@@ -1,53 +1,16 @@
-{% extends "base.html" %}
+{% extends "base_search.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load render_table from django_tables2 %}
 {% load crispy_forms_tags %}
 {% load i18n %}
 
 {% block content %}
-    <a href="{% url 'registration:signup' %}"><button class="btn btn-primary btn-block">{% trans "New user" %}</button></a>
-    <hr>
-    <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note/section ...">
-    <hr>
+<a class="btn btn-block btn-success mb-3" href="{% url 'registration:signup' %}">
+    {% trans "New user" %}
+</a>
 
-    <div id="user_table">
-        {% if table.data %}
-            {% render_table table %}
-        {% else %}
-            <div class="alert alert-warning">
-                {% trans "There is no pending user with this pattern." %}
-            </div>
-        {% endif %}
-    </div>
-{% endblock %}
-
-{% block extrajavascript %}
-<script type="text/javascript">
-    $(document).ready(function() {
-        let old_pattern = null;
-        let searchbar_obj = $("#searchbar");
-
-        function reloadTable() {
-            let pattern = searchbar_obj.val();
-
-            if (pattern === old_pattern || pattern === "")
-                return;
-
-            $("#user_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20") + " #user_table", init);
-
-            $(".table-row").click(function() {
-                window.document.location = $(this).data("href");
-            });
-        }
-
-        searchbar_obj.keyup(reloadTable);
-
-        function init() {
-            $(".table-row").click(function() {
-                window.document.location = $(this).data("href");
-            });
-        }
-
-        init();
-    });
-</script>
+{# Search panel #}
+{{ block.super }}
 {% endblock %}