diff --git a/templates/base.html b/templates/base.html
index 12fe5548f1edca3e63f0bf9a43024fbc15822183..943d443e857a8d56b61ab529ef1bb9c0816b8b4b 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -55,7 +55,7 @@
                     </li>
                     {% else%}
                     <li class="nav-item active">
-                        <a class="nav-link" href="{% url 'signup' %}">
+                        <a class="nav-link" href="{% url 'member:signup' %}">
                             <i class="fa fa-user-plus"></i> S'inscrire
                         </a>
                     </li>
diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html
index 48949e8441900ba1a5b4fc8f24e127722d904d7c..c0c27f47713b4989b3cecba6c0f0f0f6fe479ad3 100644
--- a/templates/registration/logged_out.html
+++ b/templates/registration/logged_out.html
@@ -1,4 +1,4 @@
-{% extends "registration/logged_out.html" %}
+{% extends "base.html" %}
 {% comment %}
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
@@ -13,4 +13,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% block content %}
     <p>{% trans "Thanks for spending some quality time with the Web site today." %}</p>
     <p><a href="{% url 'index' %}">{% trans 'Log in again' %}</a></p>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/registration/login.html b/templates/registration/login.html
index 8d10a1b9f5148e827fa1ed1ad6800a9993463e3a..73df75214dd1af49a456496280dd1d6ef17abe7e 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -1,8 +1,17 @@
-{% extends "admin/login.html" %}
+{% extends "base.html" %}
 {% comment %}
 SPDX-License-Identifier: GPL-2.0-or-later
 {% endcomment %}
 
 {% load i18n %}
 
-{% block title %}{% trans "Log in" %}{% endblock %}
\ No newline at end of file
+{% block title %}{% trans "Log in" %}{% endblock %}
+
+{% block content %}
+<h2>Login</h2>
+<form method="post">
+  {% csrf_token %}
+  {{ form.as_p }}
+  <button type="submit">Login</button>
+</form>
+{% endblock %}
diff --git a/templates/registration/password_change_done.html b/templates/registration/password_change_done.html
index d42fbfd9dd048dd0ee101caa6b4e74bf4d2682c4..45edfe02d0c37b960beeb757192a040619d8b385 100644
--- a/templates/registration/password_change_done.html
+++ b/templates/registration/password_change_done.html
@@ -1,4 +1,4 @@
-{% extends "registration/password_change_done.html" %}
+{% extends "base.html" %}
 {% comment %}
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html
index 07ab38c9401f09b21fb7b0c67c0f0ff8404d8163..45edfe02d0c37b960beeb757192a040619d8b385 100644
--- a/templates/registration/password_change_form.html
+++ b/templates/registration/password_change_form.html
@@ -1,4 +1,4 @@
-{% extends "registration/password_change_form.html" %}
+{% extends "base.html" %}
 {% comment %}
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
diff --git a/templates/registration/password_reset_complete.html b/templates/registration/password_reset_complete.html
index f0ec4b8fb37c7c01357c74925bbd56e0e6ec534a..055244cb24af602d5d7168f6eed4f5d61fec8018 100644
--- a/templates/registration/password_reset_complete.html
+++ b/templates/registration/password_reset_complete.html
@@ -1,4 +1,4 @@
-{% extends "registration/password_reset_complete.html" %}
+{% extends "base.html" %}
 {% comment %}
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
diff --git a/templates/registration/password_reset_confirm.html b/templates/registration/password_reset_confirm.html
index 62a761d55ad7f2da3ca7c2c848ed2e38436711bb..edb1ae1e5b6db102479fa04d6b136e68e2ec9c64 100644
--- a/templates/registration/password_reset_confirm.html
+++ b/templates/registration/password_reset_confirm.html
@@ -1,4 +1,4 @@
-{% extends "registration/password_reset_confirm.html" %}
+{% extends "base.html" %}
 {% comment %}
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
diff --git a/templates/registration/password_reset_done.html b/templates/registration/password_reset_done.html
index ea67e596e92278f9926fd8faeaca1bcce309b558..055244cb24af602d5d7168f6eed4f5d61fec8018 100644
--- a/templates/registration/password_reset_done.html
+++ b/templates/registration/password_reset_done.html
@@ -1,4 +1,4 @@
-{% extends "registration/password_reset_done.html" %}
+{% extends "base.html" %}
 {% comment %}
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
diff --git a/templates/registration/password_reset_form.html b/templates/registration/password_reset_form.html
index 865d5160460795d7d4ee41ea307bd2520b9c4289..055244cb24af602d5d7168f6eed4f5d61fec8018 100644
--- a/templates/registration/password_reset_form.html
+++ b/templates/registration/password_reset_form.html
@@ -1,4 +1,4 @@
-{% extends "registration/password_reset_form.html" %}
+{% extends "base.html" %}
 {% comment %}
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}