diff --git a/app/components/main_header.vue b/app/components/main_header.vue
index 7f6b68b..817e083 100644
--- a/app/components/main_header.vue
+++ b/app/components/main_header.vue
@@ -27,14 +27,11 @@ const props = defineProps({
 })
 
   function logout() {
-    return fetch("/logout").then(
-      (response) => {
-        if (response.ok) {
-          window.location.href = "/";
-        }
-      }
-    )
+    return $fetch("/logout").then((r) => {
+          reloadNuxtApp({ path: "/" })
+        });
   }
+    
 
 
 </script>
diff --git a/app/pages/login.vue b/app/pages/login.vue
index cc80b2e..fa803e1 100644
--- a/app/pages/login.vue
+++ b/app/pages/login.vue
@@ -39,20 +39,17 @@ const schema = z.object({
 type Schema = z.output<typeof schema>
 
 function onSubmit(payload: FormSubmitEvent<Schema>) {
-  return fetch(base_url + "/login", {
+  return $fetch("/login", {
     method: "POST",
-    headers: { 
-      "Content-Type" : "application/json"
-    },
-    body: JSON.stringify({
+    body: {
       email: payload.data.email,
       password: payload.data.password,
       remember: payload.data.remember || false
-    })
-  }).then((response) => {
-    if (response.ok) 
-      window.location.href = "/";
-    else if (response.status == 401) {
+    }
+  }).then((r) => {
+      reloadNuxtApp({path: "/"});
+  }).catch((err) => {
+    if(err.data.statusCode == 401) {
       wrong_login.value = true;
       // show for 5 seconds
       setTimeout(() => wrong_login.value = false, 5000);
diff --git a/app/pages/settings/general.vue b/app/pages/settings/general.vue
index 4fee7cb..d345fbd 100644
--- a/app/pages/settings/general.vue
+++ b/app/pages/settings/general.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
     import * as z from 'zod'
     import type { FormSubmitEvent } from '@nuxt/ui'
+    import urlJoin from "url-join"
 
     definePageMeta({
         layout: "settings",
@@ -27,7 +28,7 @@
 
     async function submitChanges(event: FormSubmitEvent<Schema>) {
         loading_btn.value = true
-        await fetch(base_url + "/settings/edit_user", {
+        await fetch(urlJoin(conf.app.baseURL, "/settings/edit_user"), {
             method: "POST",
             headers: {
                 "Content-Type": "application/json"
diff --git a/app/pages/settings/security.vue b/app/pages/settings/security.vue
index 9130a1b..9329e7f 100644
--- a/app/pages/settings/security.vue
+++ b/app/pages/settings/security.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
     import * as z from 'zod'
     import type { FormSubmitEvent } from '@nuxt/ui'
+    import urlJoin from 'url-join'
 
     definePageMeta({
         layout: "settings",
@@ -9,7 +10,7 @@
     const loading_btn = ref(false)
     const toast = useToast()
     const config = useRuntimeConfig()
-    const base_url = config.app.baseURL.endsWith('/') ? config.app.baseURL.slice(0, -1) : config.app.baseURL
+    //const base_url = config.app.baseURL.endsWith('/') ? config.app.baseURL.slice(0, -1) : config.app.baseURL
 
 
     const schema = z.object({
@@ -34,7 +35,7 @@
     async function submitChanges(event: FormSubmitEvent<Schema>) {
         loading_btn.value = true
         try {
-            fetch(base_url + "/settings/changepw", {
+            fetch(urlJoin(config.app.baseURL,"/settings/changepw"), {
                 method: "POST",
                 headers: {
                     "Content-Type": "application/json"
@@ -51,10 +52,10 @@
             }
             else {
                 const body = await response.json()
-                console.log(body)
+                console.log(body.statusMessage || "")
                 toast.add({
                 title: 'Error',
-                description : body.data.detail || 'Something went wrong',
+                description : body.data?.detail || body.statusMessage || 'Something went wrong',
                 color: 'error'
             })
             }