diff --git a/app/pages/login.vue b/app/pages/login.vue
index 1d8290c..670a712 100644
--- a/app/pages/login.vue
+++ b/app/pages/login.vue
@@ -6,6 +6,7 @@ definePageMeta({
 });
 const { fetch } = useUserSession();
 const router = useRouter();
+const route = useRoute();
 const localePath = useLocalePath();
 const { isValid, resetValidation, validate } = useForm('formRef');
 const validation = useValidation();
@@ -28,7 +29,15 @@ async function submit() {
       body: form
     });
     await fetch();
-    await router.push(localePath('/'));
+    await router.push(
+      localePath(
+        (route.query.to
+          ? typeof route.query.to === 'string'
+            ? route.query.to
+            : route.query.to[0]
+          : '/') || '/'
+      )
+    );
     return;
   } catch (e) {
     if (e instanceof Error && 'statusCode' in e && e.statusCode === 404) {
@@ -118,7 +127,7 @@ async function submit() {
           $t('auth.login')
         }}</VaButton>
         <VaButton
-          :to="$localePath('/register')"
+          :to="$localePath({ path: '/register', query: route.query })"
           border-color="primary"
           preset="secondary"
           >{{ $t('auth.register_instead') }}</VaButton
diff --git a/app/pages/register.vue b/app/pages/register.vue
index 804c8bc..da03c27 100644
--- a/app/pages/register.vue
+++ b/app/pages/register.vue
@@ -7,6 +7,7 @@ definePageMeta({
 });
 const { fetch } = useUserSession();
 const router = useRouter();
+const route = useRoute();
 const localePath = useLocalePath();
 const { isValid, resetValidation, validate } = useForm('formRef');
 const validation = useValidation();
@@ -30,7 +31,15 @@ async function submit() {
       body: form
     });
     await fetch();
-    await router.push(localePath('/'));
+    await router.push(
+      localePath(
+        (route.query.to
+          ? typeof route.query.to === 'string'
+            ? route.query.to
+            : route.query.to[0]
+          : '/') || '/'
+      )
+    );
     return;
   } catch (e) {
     if (e instanceof Error && 'statusCode' in e && e.statusCode === 409) {
@@ -150,7 +159,7 @@ async function submit() {
           $t('auth.register')
         }}</VaButton>
         <VaButton
-          :to="$localePath('/login')"
+          :to="$localePath({ path: '/login', query: route.query })"
           border-color="primary"
           preset="secondary"
           >{{ $t('auth.login_instead') }}</VaButton