diff --git a/ChessCubing.App/Components/UserAccessBar.razor b/ChessCubing.App/Components/UserAccessBar.razor
index f1849f3..66efe82 100644
--- a/ChessCubing.App/Components/UserAccessBar.razor
+++ b/ChessCubing.App/Components/UserAccessBar.razor
@@ -30,14 +30,22 @@
 </AuthorizeView>
 
 @code {
-    private string LoginHref => BuildAuthHref("login", CurrentReturnUrl);
-    private string RegisterHref => BuildAuthHref("register", CurrentReturnUrl);
+    [Parameter]
+    public string? ReturnUrl { get; set; }
+
+    private string LoginHref => BuildAuthHref("login", EffectiveReturnUrl);
+    private string RegisterHref => BuildAuthHref("register", EffectiveReturnUrl);
     private string LogoutHref => BuildAuthHref("logout", "/");
 
-    private string CurrentReturnUrl
+    private string EffectiveReturnUrl
     {
         get
         {
+            if (!string.IsNullOrWhiteSpace(ReturnUrl))
+            {
+                return ReturnUrl!;
+            }
+
             var relativePath = Navigation.ToBaseRelativePath(Navigation.Uri);
             if (string.IsNullOrWhiteSpace(relativePath))
             {
diff --git a/ChessCubing.App/Pages/Home.razor b/ChessCubing.App/Pages/Home.razor
index 9db2586..763468b 100644
--- a/ChessCubing.App/Pages/Home.razor
+++ b/ChessCubing.App/Pages/Home.razor
@@ -22,17 +22,13 @@
                 passe par une phase cube obligatoire, puis la partie repart avec un
                 nouveau rythme.
             </p>
+            <UserAccessBar ReturnUrl="/application.html" />
             <div class="hero-actions">
                 <a class="button primary" href="application.html">Ouvrir l'application</a>
-                <a class="button secondary" href="authentication/login?returnUrl=%2Fapplication.html">Se connecter</a>
-                <a class="button ghost" href="authentication/register?returnUrl=%2Fapplication.html">Creer un compte</a>
-            </div>
-            <div class="hero-actions hero-actions-utility">
                 <a class="button secondary" href="reglement.html">Lire le reglement</a>
                 <a class="button ghost" href="/ethan/">Ouvrir l'appli d'Ethan</a>
                 <a class="button ghost" href="/brice/">Ouvrir l'appli de Brice</a>
             </div>
-            <UserAccessBar />
         </div>
 
         <aside class="hero-preview">