diff --git a/accounts/templates/accounts/registration.html b/accounts/templates/accounts/registration.html
deleted file mode 100644
index ba48e03..0000000
--- a/accounts/templates/accounts/registration.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-2.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-{% block title %}{% trans "Sign up" %}{% endblock %}
-
-{% block content %}
-<div class="card bg-light">
-    <h3 class="card-header text-center">
-        {% trans "Sign up" %}
-    </h3>
-    <div class="card-body">
-        <form method="post">{% csrf_token %}
-            {{ form|crispy }}
-            <input type="submit" value="Envoyer" class="btn btn-primary mt-4">
-        </form>
-    </div>
-</div>
-{% endblock %}
\ No newline at end of file
diff --git a/photo21/templates/account/base.html b/photo21/templates/account/base.html
new file mode 100644
index 0000000..b166325
--- /dev/null
+++ b/photo21/templates/account/base.html
@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-2.0-or-later
+{% endcomment %}
+
+{% block title %}{% block head_title %}{% endblock %}{% endblock title %}
+
+{% block extracss %}
+<style>
+.asteriskField { display: none; }
+.form-group { margin-top: 0.5em;}
+</style>
+{% endblock %}
\ No newline at end of file
diff --git a/photo21/templates/account/login.html b/photo21/templates/account/login.html
new file mode 100644
index 0000000..c170ee5
--- /dev/null
+++ b/photo21/templates/account/login.html
@@ -0,0 +1,45 @@
+{% extends "account/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-2.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags account socialaccount %}
+{% block head_title %}{% trans "Sign In" %}{% endblock %}
+
+{% block content %}
+<div class="card bg-light mx-auto" style="max-width: 35rem;">
+    <h3 class="card-header text-center">
+        {% trans "Sign In" %}
+    </h3>
+    <div class="card-body">
+        {% get_providers as socialaccount_providers %}
+        {% if socialaccount_providers %}
+        <p>{% blocktrans with site.name as site_name %}Please sign in with one
+        of your existing third party accounts. Or, <a href="{{ signup_url }}">sign up</a>
+        for a {{ site_name }} account and sign in below:{% endblocktrans %}</p>
+
+        <div class="socialaccount_ballot">
+        <ul class="socialaccount_providers">
+            {% include "socialaccount/snippets/provider_list.html" with process="login" %}
+        </ul>
+        <div class="login-or">{% trans 'or' %}</div>
+        </div>
+
+        {% include "socialaccount/snippets/login_extra.html" %}
+
+        {% else %}
+        <p>{% blocktrans %}If you have not created an account yet, then please
+        <a href="{{ signup_url }}">sign up</a> first.{% endblocktrans %}</p>
+        {% endif %}
+
+        <form method="post" action="{% url 'account_login' %}">{% csrf_token %}
+            {{ form|crispy }}
+            {% if redirect_field_value %}
+            <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
+            {% endif %}
+            <button type="submit" class="btn btn-primary mt-2">{% trans "Sign In" %}</button>
+            <a class="btn mt-2" href="{% url 'account_reset_password' %}">{% trans "Forgot Password?" %}</a>
+        </form>
+    </div>
+</div>
+<p class="small text-center mt-1">{% trans "If any problem, please contact the server owners at" %} <code>photos[at]crans.org</code>.</p>
+{% endblock %}
diff --git a/photo21/templates/account/signup.html b/photo21/templates/account/signup.html
new file mode 100644
index 0000000..16df347
--- /dev/null
+++ b/photo21/templates/account/signup.html
@@ -0,0 +1,26 @@
+{% extends "account/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-2.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags %}
+{% block head_title %}{% trans "Signup" %}{% endblock %}
+
+{% block content %}
+<div class="card bg-light">
+    <h3 class="card-header text-center">
+        {% trans "Sign Up" %}
+    </h3>
+    <div class="card-body">
+        <p>{% blocktrans %}Already have an account? Then please <a href="{{ login_url }}">sign in</a>.{% endblocktrans %}</p>
+
+        <form class="signup" id="signup_form" method="post" action="{% url 'account_signup' %}">
+            {% csrf_token %}
+            {{ form | crispy }}
+            {% if redirect_field_value %}
+            <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
+            {% endif %}
+            <button type="submit" class="btn btn-primary mt-2">{% trans "Sign Up" %} &raquo;</button>
+        </form>
+    </div>
+</div>
+{% endblock %}
diff --git a/photo21/templates/base.html b/photo21/templates/base.html
index d863a89..c01eac0 100644
--- a/photo21/templates/base.html
+++ b/photo21/templates/base.html
@@ -43,7 +43,17 @@ SPDX-License-Identifier: GPL-3.0-or-later
                 <ul class="navbar-nav">
                     {% if request.user.is_authenticated %}
                         <li class="nav-item">
-                            <a class="nav-link" href="{% url 'logout' %}">
+                            <a class="nav-link" href="{% url 'account_email' %}">
+                                {% trans "Change E-mail" %}
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" href="{% url 'socialaccount_connections' %}">
+                                {% trans "Social connections" %}
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" href="{% url 'account_logout' %}">
                                 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-box-arrow-right" viewBox="0 0 16 16">
                                     <path fill-rule="evenodd" d="M10 12.5a.5.5 0 0 1-.5.5h-8a.5.5 0 0 1-.5-.5v-9a.5.5 0 0 1 .5-.5h8a.5.5 0 0 1 .5.5v2a.5.5 0 0 0 1 0v-2A1.5 1.5 0 0 0 9.5 2h-8A1.5 1.5 0 0 0 0 3.5v9A1.5 1.5 0 0 0 1.5 14h8a1.5 1.5 0 0 0 1.5-1.5v-2a.5.5 0 0 0-1 0v2z"/>
                                     <path fill-rule="evenodd" d="M15.854 8.354a.5.5 0 0 0 0-.708l-3-3a.5.5 0 0 0-.708.708L14.293 7.5H5.5a.5.5 0 0 0 0 1h8.793l-2.147 2.146a.5.5 0 0 0 .708.708l3-3z"/>
@@ -53,7 +63,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                         </li>
                     {% else %}
                         <li class="nav-item">
-                            <a class="nav-link" href="{% url 'login' %}">
+                            <a class="nav-link" href="{% url 'account_login' %}">
                                 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-box-arrow-in-right" viewBox="0 0 16 16">
                                     <path fill-rule="evenodd" d="M6 3.5a.5.5 0 0 1 .5-.5h8a.5.5 0 0 1 .5.5v9a.5.5 0 0 1-.5.5h-8a.5.5 0 0 1-.5-.5v-2a.5.5 0 0 0-1 0v2A1.5 1.5 0 0 0 6.5 14h8a1.5 1.5 0 0 0 1.5-1.5v-9A1.5 1.5 0 0 0 14.5 2h-8A1.5 1.5 0 0 0 5 3.5v2a.5.5 0 0 0 1 0v-2z"/>
                                     <path fill-rule="evenodd" d="M11.854 8.354a.5.5 0 0 0 0-.708l-3-3a.5.5 0 1 0-.708.708L10.293 7.5H1.5a.5.5 0 0 0 0 1h8.793l-2.147 2.146a.5.5 0 0 0 .708.708l3-3z"/>
@@ -62,7 +72,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link" href="{% url 'registration' %}">
+                            <a class="nav-link" href="{% url 'account_signup' %}">
                                 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-person-plus" viewBox="0 0 16 16">
                                     <path d="M6 8a3 3 0 1 0 0-6 3 3 0 0 0 0 6zm2-3a2 2 0 1 1-4 0 2 2 0 0 1 4 0zm4 8c0 1-1 1-1 1H1s-1 0-1-1 1-4 6-4 6 3 6 4zm-1-.004c-.001-.246-.154-.986-.832-1.664C9.516 10.68 8.289 10 6 10c-2.29 0-3.516.68-4.168 1.332-.678.678-.83 1.418-.832 1.664h10z"/>
                                     <path fill-rule="evenodd" d="M13.5 5a.5.5 0 0 1 .5.5V7h1.5a.5.5 0 0 1 0 1H14v1.5a.5.5 0 0 1-1 0V8h-1.5a.5.5 0 0 1 0-1H13V5.5a.5.5 0 0 1 .5-.5z"/>
diff --git a/photo21/templates/registration/logged_out.html b/photo21/templates/registration/logged_out.html
deleted file mode 100644
index b81c143..0000000
--- a/photo21/templates/registration/logged_out.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n %}
-
-{% block content %}
-<div class="card bg-light">
-    <h3 class="card-header text-center">
-        {{ title }}
-    </h3>
-    <div class="card-body">
-        <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>
-    </div>
-</div>
-{% endblock %}
diff --git a/photo21/templates/registration/login.html b/photo21/templates/registration/login.html
deleted file mode 100644
index bf5d5f0..0000000
--- a/photo21/templates/registration/login.html
+++ /dev/null
@@ -1,40 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-2.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-{% block title %}{% trans "Log in" %}{% endblock %}
-
-{% block content %}
-<div class="card bg-light mx-auto" style="max-width: 35rem;">
-    <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?
-            {% 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-lg mt-2">
-            <a href="{% url 'password_reset' %}"
-                class="badge bg-light text-dark">{% trans 'Forgotten your password or username?' %}</a>
-        </form>
-    </div>
-</div>
-<p class="small text-center mt-1">{% trans "If any problem, please contact the server owners at" %} <code>photos[at]crans.org</code>.</p>
-{% endblock %}
diff --git a/photo21/templates/registration/password_change_done.html b/photo21/templates/registration/password_change_done.html
deleted file mode 100644
index bcc1a0f..0000000
--- a/photo21/templates/registration/password_change_done.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n %}
-
-{% block content %}
-<div class="card bg-light">
-    <h3 class="card-header text-center">
-        {{ title }}
-    </h3>
-    <div class="card-body">
-        <p>{% trans 'Your password was changed.' %}</p>
-    </div>
-</div>
-{% endblock %}
diff --git a/photo21/templates/registration/password_change_form.html b/photo21/templates/registration/password_change_form.html
deleted file mode 100644
index d74c762..0000000
--- a/photo21/templates/registration/password_change_form.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-light">
-    <h3 class="card-header text-center">
-        {{ title }}
-    </h3>
-    <div class="card-body">
-        <form method="post">{% csrf_token %}
-            <p>{% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}</p>
-            {{ form|crispy }}
-            <input class="btn btn-primary" type="submit" value="{% trans 'Change my password' %}">
-        </form>
-    </div>
-</div>
-{% endblock %}
diff --git a/photo21/templates/registration/password_reset_complete.html b/photo21/templates/registration/password_reset_complete.html
deleted file mode 100644
index 7e8dd74..0000000
--- a/photo21/templates/registration/password_reset_complete.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n %}
-
-{% block content %}
-<div class="card bg-light">
-    <h3 class="card-header text-center">
-        {{ title }}
-    </h3>
-    <div class="card-body">
-        <p>{% trans "Your password has been set.  You may go ahead and log in now." %}</p>
-        <p>
-            <a href="{{ login_url }}" class="btn btn-success">{% trans 'Log in' %}</a>
-        </p>
-    </div>
-</div>
-{% endblock %}
diff --git a/photo21/templates/registration/password_reset_confirm.html b/photo21/templates/registration/password_reset_confirm.html
deleted file mode 100644
index dd41889..0000000
--- a/photo21/templates/registration/password_reset_confirm.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-light">
-    <h3 class="card-header text-center">
-        {{ title }}
-    </h3>
-    <div class="card-body">
-        {% if validlink %}
-        <p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
-        <form method="post">{% csrf_token %}
-            {{ form|crispy }}
-            <input class="btn btn-primary mt-4" type="submit" value="{% trans 'Change my password' %}">
-        </form>
-        {% else %}
-        <p>
-            {% trans "The password reset link was invalid, possibly because it has already been used.  Please request a new password reset." %}
-        </p>
-        {% endif %}
-    </div>
-</div>
-{% endblock %}
diff --git a/photo21/templates/registration/password_reset_done.html b/photo21/templates/registration/password_reset_done.html
deleted file mode 100644
index 1f22b6d..0000000
--- a/photo21/templates/registration/password_reset_done.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n %}
-
-{% block content %}
-<div class="card bg-light">
-    <h3 class="card-header text-center">
-        {{ title }}
-    </h3>
-    <div class="card-body">
-        <p>{% trans "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly." %}</p>
-        <p>{% trans "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder." %}</p>
-    </div>
-</div>
-{% endblock %}
diff --git a/photo21/templates/registration/password_reset_form.html b/photo21/templates/registration/password_reset_form.html
deleted file mode 100644
index 9a6a15c..0000000
--- a/photo21/templates/registration/password_reset_form.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-light">
-    <h3 class="card-header text-center">
-        {{ title }}
-    </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 mt-4" type="submit" value="{% trans 'Reset my password' %}">
-        </form>
-    </div>
-</div>
-{% endblock %}