diff --git a/src/lib/router-helpers.ts b/src/lib/router-helpers.ts
index f80f4ab..84bec63 100644
--- a/src/lib/router-helpers.ts
+++ b/src/lib/router-helpers.ts
@@ -77,3 +77,16 @@ export const catchAllRoute: RouteRecordRaw = {
   path: '/:pathMatch(.*)*',
   redirect: '/',
 }
+
+/**
+ * Where to send the user after a successful login. Honours a `?redirect=`
+ * query param so a page can bounce an anonymous user through /login and
+ * back (e.g. chatelet's Book button). Only same-origin absolute paths are
+ * accepted — anything else (external URLs, protocol-relative `//host`)
+ * falls back to home.
+ */
+export function postLoginTarget(redirect: unknown): string {
+  if (typeof redirect !== 'string') return '/'
+  if (!redirect.startsWith('/') || redirect.startsWith('//')) return '/'
+  return redirect
+}
diff --git a/src/pages/Login.vue b/src/pages/Login.vue
index ff89413..7a440c7 100644
--- a/src/pages/Login.vue
+++ b/src/pages/Login.vue
@@ -111,7 +111,8 @@
 
 <script setup lang="ts">
 import { ref, computed } from 'vue'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
+import { postLoginTarget } from '@/lib/router-helpers'
 import { Card, CardContent } from '@/components/ui/card'
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
@@ -120,6 +121,7 @@ import { auth } from '@/composables/useAuthService'
 import { toast } from 'vue-sonner'
 
 const router = useRouter()
+const route = useRoute()
 const isLoading = ref(false)
 const error = ref('')
 const successMessage = ref('')
@@ -155,9 +157,9 @@ async function handleLogin() {
     successMessage.value = 'Login successful! Redirecting...'
     toast.success('Login successful!')
 
-    // Redirect to home page after successful login
+    // Back to where the user came from (?redirect=), else home
     setTimeout(() => {
-      router.push('/')
+      router.push(postLoginTarget(route.query.redirect))
     }, 1500)
 
   } catch (err) {
diff --git a/src/pages/LoginDemo.vue b/src/pages/LoginDemo.vue
index af662ce..6ff7693 100644
--- a/src/pages/LoginDemo.vue
+++ b/src/pages/LoginDemo.vue
@@ -140,7 +140,8 @@
 
 <script setup lang="ts">
 import { ref, computed } from 'vue'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
+import { postLoginTarget } from '@/lib/router-helpers'
 import { Card, CardContent } from '@/components/ui/card'
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
@@ -150,6 +151,7 @@ import { useDemoAccountGenerator } from '@/composables/useDemoAccountGenerator'
 import { toast } from 'vue-sonner'
 
 const router = useRouter()
+const route = useRoute()
 const { isLoading, error, generateNewCredentials } = useDemoAccountGenerator()
 const successMessage = ref('')
 const activeMode = ref<'demo' | 'login'>('demo')
@@ -186,9 +188,9 @@ async function createFakeAccount() {
     successMessage.value = `Account created! Username: ${credentials.username}`
     toast.success(`Logged in as ${credentials.username}!`)
 
-    // Redirect to home page after successful registration
+    // Back to where the user came from (?redirect=), else home
     setTimeout(() => {
-      router.push('/')
+      router.push(postLoginTarget(route.query.redirect))
     }, 2000)
 
   } catch (err) {
@@ -216,9 +218,9 @@ async function handleLogin() {
     successMessage.value = 'Login successful! Redirecting...'
     toast.success('Login successful!')
 
-    // Redirect to home page after successful login
+    // Back to where the user came from (?redirect=), else home
     setTimeout(() => {
-      router.push('/')
+      router.push(postLoginTarget(route.query.redirect))
     }, 1500)
 
   } catch (err) {