diff --git a/authentication/src/app/flow/login/page.tsx b/authentication/src/app/flow/login/page.tsx
index 6d08e30..8a689d0 100644
--- a/authentication/src/app/flow/login/page.tsx
+++ b/authentication/src/app/flow/login/page.tsx
@@ -144,9 +144,11 @@ export default function Login() {
                     <div className="flex flex-col">
                         {
                             flow ?
-                                <Button variant="link" asChild>
-                                    <Link href="/flow/recovery" className="text-orange-600" passHref>
-                                        <span>Forgot your password?</span>
+                                <Button variant="link" asChild><Link
+                                    href={{ pathname: '/flow/recovery', query: { return_to: flow.return_to } }}
+                                    className="text-orange-600"
+                                    passHref>
+                                    Forgot your password?
                                     </Link>
                                 </Button>
                                 :
@@ -155,8 +157,11 @@ export default function Login() {
                         {
                             flow ?
                                 <Button variant="link" asChild disabled={!flow}>
-                                    <Link href="/flow/registration" className="inline-flex space-x-2" passHref>
-                                        <span>Create an account</span>
+                                    <Link
+                                        href={{ pathname: '/flow/registration', query: { return_to: flow.return_to } }}
+                                        className="inline-flex space-x-2"
+                                        passHref>
+                                        Create an account
                                     </Link>
                                 </Button>
                                 :
diff --git a/authentication/src/app/flow/recovery/page.tsx b/authentication/src/app/flow/recovery/page.tsx
index 7d699be..60ae1f3 100644
--- a/authentication/src/app/flow/recovery/page.tsx
+++ b/authentication/src/app/flow/recovery/page.tsx
@@ -114,7 +114,10 @@ export default function Recovery() {
             {
                 flow ?
                     <Button variant="link" asChild disabled={!flow}>
-                        <Link href="/flow/login" className="inline-flex space-x-2" passHref>
+                        <Link
+                            href={{ pathname: '/flow/login', query: { return_to: flow.return_to } }}
+                            className="inline-flex space-x-2"
+                            passHref>
                             Back to login
                         </Link>
                     </Button>
diff --git a/authentication/src/app/flow/registration/page.tsx b/authentication/src/app/flow/registration/page.tsx
index 7a26aca..4dd0eb7 100644
--- a/authentication/src/app/flow/registration/page.tsx
+++ b/authentication/src/app/flow/registration/page.tsx
@@ -121,7 +121,10 @@ export default function Registration() {
             {
                 flow ?
                     <Button variant="link" asChild disabled={!flow}>
-                        <Link href="/flow/login" className="inline-flex space-x-2" passHref>
+                        <Link
+                            href={{ pathname: '/flow/login', query: { return_to: flow.return_to } }}
+                            className="inline-flex space-x-2"
+                            passHref>
                             Log into your account
                         </Link>
                     </Button>
diff --git a/authentication/src/app/flow/verification/page.tsx b/authentication/src/app/flow/verification/page.tsx
index ac18b79..365413e 100644
--- a/authentication/src/app/flow/verification/page.tsx
+++ b/authentication/src/app/flow/verification/page.tsx
@@ -113,7 +113,10 @@ export default function Verification() {
             {
                 flow ?
                     <Button variant="link" asChild disabled={!flow}>
-                        <Link href="/flow/login" className="inline-flex space-x-2" passHref>
+                        <Link
+                            href={{ pathname: '/flow/login', query: { return_to: flow.return_to } }}
+                            className="inline-flex space-x-2"
+                            passHref>
                             Back to login
                         </Link>
                     </Button>
diff --git a/authentication/src/middleware.ts b/authentication/src/middleware.ts
index d7cd027..c4c06ed 100644
--- a/authentication/src/middleware.ts
+++ b/authentication/src/middleware.ts
@@ -41,5 +41,5 @@ export async function middleware(request: NextRequest) {
 }
 
 export const config = {
-    matcher: '/((?!api|_next/static|_next/image|favicon.png|sitemap.xml|robots.txt).*)',
+    matcher: '/((?!api|_next/static|_next/image|favicon.png|sitemap.xml|robots.txt|sw.js).*)',
 };