diff --git a/ui/src/components/AuthButton.svelte b/ui/src/components/AuthButton.svelte
new file mode 100644
index 0000000..fc148fe
--- /dev/null
+++ b/ui/src/components/AuthButton.svelte
@@ -0,0 +1,19 @@
+<script>
+ import { page } from '$app/stores';
+
+ let className = '';
+ export { className as class };
+
+ let auth_route = 'auth/CRI'
+ $: {
+     if ($page.url.searchParams.get('next')) {
+         auth_route = 'auth/CRI?next=' + encodeURIComponent($page.url.searchParams.get('next'));
+     } else {
+         auth_route = 'auth/CRI?';
+     }
+ }
+</script>
+
+<a href={auth_route} target="_self" class="{className}">
+    <slot></slot>
+</a>
diff --git a/ui/src/routes/__layout.svelte b/ui/src/routes/__layout.svelte
index 10145b6..a99d9f2 100644
--- a/ui/src/routes/__layout.svelte
+++ b/ui/src/routes/__layout.svelte
@@ -42,6 +42,7 @@
 </script>
 
 <script>
+ import AuthButton from '../components/AuthButton.svelte';
  import Toaster from '../components/Toaster.svelte';
 
  export let rroute = '';
@@ -129,9 +130,9 @@
                     </li>
                 {:else}
                     <li class="nav-item">
-                        <a href="auth/CRI" target="_self" class="btn btn-dark">
-	                    Se connecter
-	                </a>
+                        <AuthButton class="btn btn-dark">
+                            Se connecter
+                        </AuthButton>
                     </li>
                 {/if}
 	    </ul>
diff --git a/ui/src/routes/auth.svelte b/ui/src/routes/auth.svelte
index feb3840..df42cfb 100644
--- a/ui/src/routes/auth.svelte
+++ b/ui/src/routes/auth.svelte
@@ -14,6 +14,8 @@
  import { goto } from '$app/navigation';
  import { page } from '$app/stores'
 
+ import AuthButton from '../components/AuthButton.svelte';
+
  let auth = { username: "", password: "" };
  let pleaseWait = false;
 
@@ -70,9 +72,9 @@
     <div class="col">
         <h2>OpenId Connect</h2>
         <div class="text-center">
-            <a href="auth/CRI" class="btn btn-primary" target="_self">
+            <AuthButton class="btn btn-primary">
 	        Me connecter avec mon compte CRI
-            </a>
+            </AuthButton>
         </div>
     </div>
 </div>