diff --git a/client/pages/ai-form-builder.vue b/client/pages/ai-form-builder.vue
index 67de14cd..ef05cf69 100644
--- a/client/pages/ai-form-builder.vue
+++ b/client/pages/ai-form-builder.vue
@@ -493,40 +493,21 @@
   </div>
 </template>
 
-<script>
+<script setup>
 import { computed } from 'vue'
 import { useAuthStore } from '../stores/auth'
 
-export default {
-  layout: 'default',
+const authStore = useAuthStore()
 
-  setup () {
-    useOpnSeoMeta({
-      title: 'Free AI form builder',
-      description: 'Transform your ideas into fully functional forms with OpnForm AI Builder – quick, accurate, and tailored to fit any requirement.'
-    })
+useOpnSeoMeta({
+  title: 'Free AI form builder',
+  description: 'Transform your ideas into fully functional forms with OpnForm AI Builder – quick, accurate, and tailored to fit any requirement.'
+})
+defineRouteRules({
+  prerender: true
+})
 
-    const authStore = useAuthStore()
-    defineRouteRules({
-      prerender: true
-    })
-
-    return {
-      authenticated : computed(() => authStore.check),
-    }
-  },
-
-  data: () => ({
-  }),
-
-  mounted() {},
-
-  methods: {},
-
-  computed: {
-    configLinks: () => this.$config.links
-  }
-}
+let authenticated = computed(() => authStore.check)
 </script>
 
 <style lang="scss" scoped>
diff --git a/client/pages/auth/password/email.vue b/client/pages/auth/password/email.vue
index fae35aa7..d277490f 100644
--- a/client/pages/auth/password/email.vue
+++ b/client/pages/auth/password/email.vue
@@ -24,9 +24,10 @@
 
 <script>
 export default {
-  middleware: 'guest',
-
   setup () {
+    definePageMeta({
+      middleware: "guest"
+    })
     useOpnSeoMeta({
       title: 'Reset Password'
     })
diff --git a/client/pages/auth/password/reset.vue b/client/pages/auth/password/reset.vue
index ddd65e9c..e3c0da95 100644
--- a/client/pages/auth/password/reset.vue
+++ b/client/pages/auth/password/reset.vue
@@ -34,9 +34,10 @@
 
 <script>
 export default {
-  middleware: 'guest',
-
   setup () {
+    definePageMeta({
+      middleware: "guest"
+    })
     useOpnSeoMeta({
       title: 'Reset Password'
     })
diff --git a/client/pages/forms/[slug]/edit.vue b/client/pages/forms/[slug]/edit.vue
index 17aa1268..d32d215a 100644
--- a/client/pages/forms/[slug]/edit.vue
+++ b/client/pages/forms/[slug]/edit.vue
@@ -22,7 +22,6 @@ import {hash} from "~/lib/utils.js";
 export default {
   name: 'EditForm',
   components: { Breadcrumb, FormEditor },
-  middleware: 'auth',
 
   beforeRouteLeave (to, from, next) {
     if (this.isDirty()) {
@@ -55,6 +54,9 @@ export default {
     useOpnSeoMeta({
       title: 'Edit ' + ((form && form.value) ? form.value.title : 'Your Form')
     })
+    definePageMeta({
+      middleware: "auth"
+    })
 
     return {
       formsStore,
diff --git a/client/pages/forms/[slug]/show.vue b/client/pages/forms/[slug]/show.vue
index b60ea9d4..75437674 100644
--- a/client/pages/forms/[slug]/show.vue
+++ b/client/pages/forms/[slug]/show.vue
@@ -141,9 +141,10 @@ export default {
     FormCleanings
   },
 
-  middleware: 'auth',
-
   setup () {
+    definePageMeta({
+      middleware: "auth"
+    })
     useOpnSeoMeta({
       title: 'Home'
     })
diff --git a/client/pages/forms/[slug]/show/share.vue b/client/pages/forms/[slug]/show/share.vue
index f768a0b0..79867041 100644
--- a/client/pages/forms/[slug]/show/share.vue
+++ b/client/pages/forms/[slug]/show/share.vue
@@ -45,6 +45,9 @@ export default {
   },
 
   setup (props) {
+    definePageMeta({
+      middleware: "auth"
+    })
     useOpnSeoMeta({
       title: (props.form) ? 'Share Form - '+props.form.title : 'Share Form'
     })
diff --git a/client/pages/forms/[slug]/show/stats.vue b/client/pages/forms/[slug]/show/stats.vue
index c8ab487a..d1f0cbe5 100644
--- a/client/pages/forms/[slug]/show/stats.vue
+++ b/client/pages/forms/[slug]/show/stats.vue
@@ -18,6 +18,9 @@ export default {
   },
 
   setup (props) {
+    definePageMeta({
+      middleware: "auth"
+    })
     useOpnSeoMeta({
       title: (props.form) ? 'Form Analytics - '+props.form.title : 'Form Analytics'
     })
diff --git a/client/pages/forms/[slug]/show/submissions.vue b/client/pages/forms/[slug]/show/submissions.vue
index 6ac31a1d..768519cb 100644
--- a/client/pages/forms/[slug]/show/submissions.vue
+++ b/client/pages/forms/[slug]/show/submissions.vue
@@ -14,6 +14,9 @@ export default {
   },
 
   setup (props) {
+    definePageMeta({
+      middleware: "auth"
+    })
     useOpnSeoMeta({
       title: (props.form) ? 'Form Submissions - '+props.form.title : 'Form Submissions'
     })
diff --git a/client/pages/forms/create/guest.vue b/client/pages/forms/create/guest.vue
index 54b9f07c..677f6729 100644
--- a/client/pages/forms/create/guest.vue
+++ b/client/pages/forms/create/guest.vue
@@ -51,6 +51,9 @@ const form = storeToRefs(workingFormStore).content
 useOpnSeoMeta({
   title: 'Create a new Form for free',
 })
+definePageMeta({
+  middleware: "guest"
+})
 
 // Data
 const stateReady = ref(false)
diff --git a/client/pages/register.vue b/client/pages/register.vue
index fbd98b5e..55099864 100644
--- a/client/pages/register.vue
+++ b/client/pages/register.vue
@@ -76,8 +76,6 @@ export default {
     })
   },
 
-  middleware: 'guest',
-
   data: () => ({
   }),
 
diff --git a/client/pages/settings/account.vue b/client/pages/settings/account.vue
index 32b64f98..df16c5f1 100644
--- a/client/pages/settings/account.vue
+++ b/client/pages/settings/account.vue
@@ -25,6 +25,9 @@ let loading = false
 useOpnSeoMeta({
   title: 'Account'
 })
+definePageMeta({
+  middleware: "auth"
+})
 
 const deleteAccount = () => {
   loading = true
diff --git a/client/pages/settings/billing.vue b/client/pages/settings/billing.vue
index 0ad4afcf..66300b8a 100644
--- a/client/pages/settings/billing.vue
+++ b/client/pages/settings/billing.vue
@@ -27,6 +27,9 @@ import AppSumoBilling from '../../components/vendor/appsumo/AppSumoBilling.vue'
 useOpnSeoMeta({
   title: 'Billing'
 })
+definePageMeta({
+  middleware: "auth"
+})
 
 const authStore = useAuthStore()
 let user = computed(() => authStore.user)
diff --git a/client/pages/settings/password.vue b/client/pages/settings/password.vue
index bf0bd47c..80a234a1 100644
--- a/client/pages/settings/password.vue
+++ b/client/pages/settings/password.vue
@@ -28,6 +28,9 @@
 useOpnSeoMeta({
   title: 'Password'
 })
+definePageMeta({
+  middleware: "auth"
+})
 
 let form = useForm({
   password: '',
diff --git a/client/pages/settings/profile.vue b/client/pages/settings/profile.vue
index 8c6a2790..6a193c34 100644
--- a/client/pages/settings/profile.vue
+++ b/client/pages/settings/profile.vue
@@ -27,6 +27,9 @@ const user = computed(() => authStore.user)
 useOpnSeoMeta({
   title: 'Profile'
 })
+definePageMeta({
+  middleware: "auth"
+})
 
 let form = useForm({
   name: '',
diff --git a/client/pages/settings/workspace.vue b/client/pages/settings/workspace.vue
index 2051cd1f..902f0f7c 100644
--- a/client/pages/settings/workspace.vue
+++ b/client/pages/settings/workspace.vue
@@ -126,6 +126,9 @@ let loading = computed(() => workspacesStore.loading)
 useOpnSeoMeta({
   title: 'Workspaces'
 })
+definePageMeta({
+  middleware: "auth"
+})
 
 let form = useForm({
   name: '',
diff --git a/client/pages/templates/my-templates.vue b/client/pages/templates/my-templates.vue
index 4c3b791d..57f9afa1 100644
--- a/client/pages/templates/my-templates.vue
+++ b/client/pages/templates/my-templates.vue
@@ -22,9 +22,11 @@ import TemplatesList from '../../components/pages/templates/TemplatesList.vue'
 
 export default {
   components: { TemplatesList },
-  middleware: 'auth',
 
   setup () {
+    definePageMeta({
+      middleware: "auth"
+    })
     useOpnSeoMeta({
       title: 'My Templates',
       description: 'Our collection of beautiful templates to create your own forms!'