diff --git a/lacommunaute/openid_connect/tests/tests_views.py b/lacommunaute/openid_connect/tests/tests_views.py
index 63b7fd38e..746f0f795 100644
--- a/lacommunaute/openid_connect/tests/tests_views.py
+++ b/lacommunaute/openid_connect/tests/tests_views.py
@@ -179,7 +179,7 @@ def test_normal_signin(self):
 
         # Then log in again.
         response = self.client.get(reverse("pages:home"))
-        self.assertContains(response, reverse("openid_connect:authorize"))
+        self.assertContains(response, reverse("users:login"))
 
         response = mock_oauth_dance(self, assert_redirects=False)
         expected_redirection = reverse("pages:home")
diff --git a/lacommunaute/pages/tests/__snapshots__/test_homepage.ambr b/lacommunaute/pages/tests/__snapshots__/test_homepage.ambr
index 37894f351..3d7864583 100644
--- a/lacommunaute/pages/tests/__snapshots__/test_homepage.ambr
+++ b/lacommunaute/pages/tests/__snapshots__/test_homepage.ambr
@@ -164,11 +164,11 @@
                                       </div>
                                   </form>
                               </li>
-                              
+
                                   <li>
-                                      <a class="btn" href="/pro_connect/authorize" rel="nofollow">Se connecter | S'inscrire</a>
-                                  </li>
-                              
+  <a class="btn btn-outline-primary btn-ico btn-block" href="/users/login/?next=/" rel="nofollow">Se connecter | S'inscrire</a>
+  </li>
+
                           </ul>
                       </nav>
                   </div>
@@ -255,11 +255,11 @@
           </div>
           <div class="offcanvas-footer flex-column align-items-stretch">
               <nav aria-label="Menu de navigation principale pour mobile" role="navigation">
-                  
+
                       <div>
-                          <a class="btn" href="/pro_connect/authorize" rel="nofollow">Se connecter | S'inscrire</a>
-                      </div>
-                  
+  <a class="btn btn-outline-primary btn-ico btn-block" href="/members/login/?next=/" rel="nofollow">Se connecter | S'inscrire</a>
+  </div>
+
               </nav>
           </div>
       </div>
diff --git a/lacommunaute/surveys/tests/test_views.py b/lacommunaute/surveys/tests/test_views.py
index a974223f0..d37e0676a 100644
--- a/lacommunaute/surveys/tests/test_views.py
+++ b/lacommunaute/surveys/tests/test_views.py
@@ -23,7 +23,7 @@
 location_field_list = ["location", "city_code"]
 
 form_html = '<form method="post">'
-login_with_next_url = reverse("openid_connect:authorize") + "?next=" + reverse("surveys:dsp_create")
+login_with_next_url = reverse("users:login") + "?next=" + reverse("surveys:dsp_create")
 
 
 class TestDSPCreateView:
diff --git a/lacommunaute/templates/partials/header.html b/lacommunaute/templates/partials/header.html
index 8a7f70065..849bf078c 100644
--- a/lacommunaute/templates/partials/header.html
+++ b/lacommunaute/templates/partials/header.html
@@ -103,16 +103,12 @@
                                             <li>
                                                 <div class="dropdown-divider"></div>
                                             </li>
-                                            <li>
-                                                <a class="dropdown-item text-danger" id="js-logout" href="{% url 'openid_connect:logout' %}">Déconnexion</a>
-                                            </li>
+                                            <li>{% include "registration/includes/logout_link.html" %}</li>
                                         </ul>
                                     </div>
                                 </li>
                             {% else %}
-                                <li>
-                                    <a href="{% url 'openid_connect:authorize' %}" rel="nofollow" class="btn">Se connecter | S'inscrire</a>
-                                </li>
+                                <li>{% include "registration/includes/login_link.html" %}</li>
                             {% endif %}
                         </ul>
                     </nav>
@@ -277,16 +273,12 @@ <h4 class="h5 mb-0 btn-ico align-items-center" id="offcanvasApplyFiltersLabel">
                                 <li>
                                     <div class="dropdown-divider"></div>
                                 </li>
-                                <li>
-                                    <a class="dropdown-item text-danger" id="js-logout" href="{% url 'openid_connect:logout' %}">Déconnexion</a>
-                                </li>
+                                <li>{% include "registration/includes/logout_link.html" %}</li>
                             </ul>
                         </div>
                     </div>
                 {% else %}
-                    <div>
-                        <a href="{% url 'openid_connect:authorize' %}" rel="nofollow" class="btn">Se connecter | S'inscrire</a>
-                    </div>
+                    <div>{% include "registration/includes/login_link.html" %}</div>
                 {% endif %}
             </nav>
         </div>
diff --git a/lacommunaute/templates/registration/includes/login_link.html b/lacommunaute/templates/registration/includes/login_link.html
new file mode 100644
index 000000000..c293b6920
--- /dev/null
+++ b/lacommunaute/templates/registration/includes/login_link.html
@@ -0,0 +1,2 @@
+{% load i18n %}
+<a href="{% url 'users:login' %}?next={{ request.path }}" rel="nofollow" class="btn btn-outline-primary btn-ico btn-block">{% trans "Login | Sign in" %}</a>
diff --git a/lacommunaute/templates/registration/includes/logout_link.html b/lacommunaute/templates/registration/includes/logout_link.html
new file mode 100644
index 000000000..ef233f9f1
--- /dev/null
+++ b/lacommunaute/templates/registration/includes/logout_link.html
@@ -0,0 +1,6 @@
+{% if request.session.MAGIC_LINK %}
+    {% url 'users:logout' as logout_url %}
+{% else %}
+    {% url 'openid_connect:logout' as logout_url %}
+{% endif %}
+<a class="dropdown-item text-danger" id="js-logout" href="{{ logout_url }}"">Déconnexion</a>
diff --git a/lacommunaute/templates/surveys/dsp_form.html b/lacommunaute/templates/surveys/dsp_form.html
index 8add61e34..6a85a83a9 100644
--- a/lacommunaute/templates/surveys/dsp_form.html
+++ b/lacommunaute/templates/surveys/dsp_form.html
@@ -66,9 +66,7 @@ <h1 class="s-title-01__title h1">Diagnostic Parcours IAE</h1>
                         <div class="c-box mb-5">
                             <div class="row">
                                 <div class="col-lg col-12 mb-3">Je me connecte pour accéder à l'aide au diagnostic pour le parcours IAE</div>
-                                <div class="col-lg-auto col-12">
-                                    <a href="{% url 'openid_connect:authorize' %}?next={% url 'surveys:dsp_create' %}" rel="nofollow" class="btn btn-outline-primary btn-ico btn-block">Me connecter</a>
-                                </div>
+                                <div class="col-lg-auto col-12">{% include "registration/includes/login_link.html" %}</div>
                             </div>
                         </div>
                     </div>