diff --git a/templates/layouts/auth.gohtml b/templates/layouts/auth.gohtml
index 6b78cd5..2fafea0 100644
--- a/templates/layouts/auth.gohtml
+++ b/templates/layouts/auth.gohtml
@@ -17,6 +17,12 @@
                             <div class="box">
                                 {{template "messages" .}}
                                 {{template "content" .}}
+
+                                <div class="content is-small has-text-centered" hx-boost="true">
+                                    <a href="{{call .ToURL "login"}}">Login</a> &#9676;
+                                    <a href="{{call .ToURL "register"}}">Create an account</a> &#9676;
+                                    <a href="{{call .ToURL "forgot_password"}}">Forgot password?</a>
+                                </div>
                             </div>
                         </div>
                     </div>
diff --git a/templates/pages/login.gohtml b/templates/pages/login.gohtml
index 49747d5..d56d433 100644
--- a/templates/pages/login.gohtml
+++ b/templates/pages/login.gohtml
@@ -1,5 +1,6 @@
 {{define "content"}}
-    <form method="post">
+    <form method="post" hx-boost="true">
+        {{template "messages" .}}
         <div class="field">
             <label for="email" class="label">Email address</label>
             <div class="control">
@@ -24,5 +25,4 @@
         </div>
         {{template "csrf" .}}
     </form>
-    <div class="content is-small"><a href="{{call .ToURL "register"}}">Create an account</a> - <a href="{{call .ToURL "forgot_password"}}">Forgot password?</a></div>
 {{end}}
\ No newline at end of file
diff --git a/templates/pages/register.gohtml b/templates/pages/register.gohtml
index a9d58e9..200ae27 100644
--- a/templates/pages/register.gohtml
+++ b/templates/pages/register.gohtml
@@ -1,5 +1,5 @@
 {{define "content"}}
-    <form method="post">
+    <form method="post" hx-boost="true">
         <div class="field">
             <label for="name" class="label">Name</label>
             <div class="control">
diff --git a/templates/pages/reset-password.gohtml b/templates/pages/reset-password.gohtml
index 16d4b8d..a1f5ce0 100644
--- a/templates/pages/reset-password.gohtml
+++ b/templates/pages/reset-password.gohtml
@@ -1,5 +1,5 @@
 {{define "content"}}
-    <form method="post">
+    <form method="post" hx-boost="true">
         <div class="field">
             <label for="password" class="label">Password</label>
             <div class="control">