diff --git a/src/dgsi/views.py b/src/dgsi/views.py
index 3a25013..7950dba 100644
--- a/src/dgsi/views.py
+++ b/src/dgsi/views.py
@@ -59,15 +59,12 @@ ADMIN_LINKS: list[Link] = [
 
 class IndexView(TemplateView):
     template_name = "dgsi/index.html"
-
-    def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
-        return super().get_context_data(
-            links={
-                "authenticated": AUTHENTICATED_LINKS,
-                "admin": ADMIN_LINKS,
-            },
-            **kwargs,
-        )
+    extra_context = {
+        "links": {
+            "authenticated": AUTHENTICATED_LINKS,
+            "admin": ADMIN_LINKS,
+        }
+    }
 
 
 class ProfileView(LoginRequiredMixin, TemplateView):
@@ -125,10 +122,14 @@ class GenerateWiFiPasswordView(LoginRequiredMixin, RedirectView):
         else:
             # Give access to the wifi network when the user creates its first password
             if not user.kanidm.radius_secret:
+                message = _("Mot de passe Wi-Fi généré avec succès.")
                 async_to_sync(klient.group_add_members)(
                     "radius_access", [user.username]
                 )
+            else:
+                message = _("Mot de passe Wi-Fi reinitialisé avec succès.")
             async_to_sync(klient.call_post)(f"/v1/person/{user.username}/_radius")
+            messages.add_message(request, messages.SUCCESS, message)
 
         return super().get(request, *args, **kwargs)
 
@@ -140,6 +141,7 @@ class CreateSelfAccountView(AccessMixin, SuccessMessageMixin, FormView):
     form_class = CreateSelfAccountForm
     success_message = _("Compte DGNum créé avec succès")
     success_url = reverse_lazy("dgsi:dgn-profile")
+    extra_context = {"backlink": "dgsi:dgn-profile"}
 
     def dispatch(
         self, request: HttpRequest, *args: Any, **kwargs: Any
@@ -209,9 +211,6 @@ class CreateSelfAccountView(AccessMixin, SuccessMessageMixin, FormView):
 
         return super().form_valid(form)
 
-    def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
-        return super().get_context_data(backlink="dgsi:dgn-profile", **kwargs)
-
 
 class ArchiveListView(LoginRequiredMixin, TemplateView):
     template_name = "dgsi/archive_list.html"