diff --git a/app/components/main_header.vue b/app/components/main_header.vue
index 96fa574..13c1da4 100644
--- a/app/components/main_header.vue
+++ b/app/components/main_header.vue
@@ -15,11 +15,26 @@ const props = defineProps({
     type: Boolean,
     required: false,
     default: true
+  },
+  logged_in: {
+    type: Boolean,
+    required: false,
+    default: false
   }
 
+
+
 })
 
-
+  function logout() {
+    return fetch("/logout").then(
+      (response) => {
+        if (response.ok) {
+          window.location.reload;
+        }
+      }
+    )
+  }
 
 
 </script>
@@ -33,10 +48,10 @@ const props = defineProps({
             <!----<UDropdownMenu :items="ui_colors_dropdown">
                 <UButton icon="lucide:palette" variant="ghost" color="neutral" />
             </UDropdownMenu>-->
-            <UButton icon="lucide:settings" variant="ghost" color="neutral" :to="props.settings_link ? '/settings/general' : undefined" v-if="loggedIn" />
+            <UButton icon="lucide:settings" variant="ghost" color="neutral" :to="props.settings_link ? '/settings/general' : undefined" v-if="props.logged_in" />
             <UModal :ui="{ overlay: 'bg-black opacity-75', content: 'bg-zinc-950 py-3'}" v-model:open="logout_prompt">
 
-              <UButton icon="lucide:log-out" variant="ghost" color="error" class="hover:cursor-pointer" v-if="loggedIn" />
+              <UButton icon="lucide:log-out" variant="ghost" color="error" class="hover:cursor-pointer" v-if="props.logged_in" />
               
               <template #content>
                 <div class="p-4 text-center">
@@ -46,13 +61,13 @@ const props = defineProps({
                   </p>
                   <div class="flex gap-4 flex-col justify-end">
                     <UButton class="w-full hover:cursor-pointer dark:bg-zinc-900 hover:dark:bg-zinc-800 active:dark:bg-black" variant="soft" color="neutral" @click="logout_prompt = false">No</UButton>
-                    <UButton class="w-full" variant="soft" color="error" to="/logout">Yes</UButton>
+                    <UButton class="w-full" variant="soft" color="error" loading-auto @click="logout()">Yes</UButton>
                   </div>
                 </div>
               </template>
 
             </UModal>
-            <UButton icon="lucide:log-in" variant="soft" color="success" v-if="!loggedIn" to="/login">Login</UButton>
+            <UButton icon="lucide:log-in" variant="soft" color="success" v-if="!props.logged_in" to="/login">Login</UButton>
           </template>
     </UHeader>
 </template>
diff --git a/app/pages/index.vue b/app/pages/index.vue
index f9fdb1d..47f7976 100644
--- a/app/pages/index.vue
+++ b/app/pages/index.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
 
+  const { loggedIn } = useUserSession()
+
   const video = ref(0);
   const url = ref("");
   const in_url = ref("");
@@ -29,7 +31,7 @@
 </script>
 
 <template>
-    <MainHeader/>
+    <MainHeader :logged_in="loggedIn"/>
     <div class="justify-center flex flex-col max-sm:mt-5 max-md:mt-7 max-lg:mt-10 lg:mt-15 mb-4 w-full">
         <h1 class="inter font-bold text-center mt-3 mb-3 text-white white-glow max-sm:text-5xl sm:text-6xl md:text-7xl xl:text-8xl rgb-text">Youtube to MP3</h1>
 
diff --git a/app/pages/login.vue b/app/pages/login.vue
index ed14a5d..a155b77 100644
--- a/app/pages/login.vue
+++ b/app/pages/login.vue
@@ -35,7 +35,24 @@ const schema = z.object({
 type Schema = z.output<typeof schema>
 
 function onSubmit(payload: FormSubmitEvent<Schema>) {
-  console.log('Submitted', payload)
+  return fetch("/login", {
+    method: "POST",
+    headers: { 
+      "Content-Type" : "application/json"
+    },
+    body: JSON.stringify({
+      email: payload.data.email,
+      password: payload.data.password
+    })
+  }).then((response) => {
+    if (response.ok) 
+      window.location.href = "/";
+    else if (response.status == 401) {
+      wrong_login.value = true;
+      // show for 5 seconds
+      setTimeout(() => wrong_login.value = false, 5000);
+    }
+  })
 }
 </script>
 
@@ -50,17 +67,22 @@ function onSubmit(payload: FormSubmitEvent<Schema>) {
         :submit="{
           label: 'Login',
           class: 'rounded-full',
-          variant: 'soft'
+          variant: 'soft',
+          loadingAuto: true
         }"
+        @submit="onSubmit"
     >
-        <template #validation v-if="wrong_login">
-          <UAlert color="error"
-                  icon="lucide:circle-x" 
-                  variant="soft" 
-                  :ui="{ icon: 'self-center' }"
-                  title="Incorrect Login" 
-                  description="Either your e-mail or your password are wrong."/>
-        </template>
+      <template #validation>
+        <Transition name="slide-fade">
+        <UAlert v-if="wrong_login"
+                color="error"
+                icon="lucide:circle-x" 
+                variant="soft" 
+                :ui="{ icon: 'self-center' }"
+                title="Incorrect Login" 
+                description="Either your e-mail or your password are wrong."/>
+        </Transition>
+      </template>
     </UAuthForm>
     </UPageCard>
   </div>
@@ -68,3 +90,19 @@ function onSubmit(payload: FormSubmitEvent<Schema>) {
 
 </template>
 
+<style>
+.slide-fade-enter-from {
+  opacity: 0;
+  transform: translateY(-10px);
+}
+.slide-fade-enter-active {
+  transition: opacity 0.3s, transform 0.3s;
+}
+.slide-fade-leave-to {
+  opacity: 0;
+  transform: translateY(-10px);
+}
+.slide-fade-leave-active {
+  transition: opacity 0.3s, transform 0.3s;
+}
+</style>
diff --git a/server/fastapi_server/fastapi_server.py b/server/fastapi_server/fastapi_server.py
index df8c615..3840394 100644
--- a/server/fastapi_server/fastapi_server.py
+++ b/server/fastapi_server/fastapi_server.py
@@ -8,6 +8,10 @@ import aiomysql
 import bcrypt
 #import asyncio
 
+# In this FastAPI example, we skip BaseModel verification cause NuxtJS does that for us
+# In other words, this backend only recieves requests from nuxt js backend
+# So we can trust it
+
 class db:
     pool = None
 
@@ -49,7 +53,7 @@ class register_model(BaseModel):
 async def create_user(req: Request):
     body = await req.json()
 
-    body = register_model(**body)
+    #body = register_model(**body)
     # Auto exceptions give more verbose to Nuxt.
 
     #try:
@@ -57,7 +61,7 @@ async def create_user(req: Request):
     #except ValidationError:
     #    raise HTTPException(status_code=400, detail="Missing / invalid arguments")
     
-    body.password = bcrypt.hashpw(body.password.encode(), bcrypt.gensalt()).decode()
+    body["password"] = bcrypt.hashpw(body["password"].encode(), bcrypt.gensalt()).decode()
     async with db.pool.acquire() as conn:
         async with conn.cursor() as cur:
             await cur.execute("INSERT INTO users (`first_name`,`last_name`,`email`,`password`) VALUES (%s,%s,%s,%s)", (body.first_name, body.last_name, body.email, body.password))
@@ -71,12 +75,13 @@ class login_data(BaseModel):
 async def login_endpoint(req: Request):
     
     body = await req.json()
+    #print(body)
     try:
-        login = login_data(**body)
+        #login = login_data(**body)
         # ensure it's only email and password
         user_data = await fetch_user_info(body["email"])
         if (user_data is None): 
-            raise HTTPException(status_code=401)
+            raise HTTPException(status_code=401, detail="User doesn't exist")
         else:
             pwd = user_data.get("password")
             if (bcrypt.checkpw(body["password"].encode(), user_data.get("password").encode())):
diff --git a/server/routes/login.post.ts b/server/routes/login.post.ts
index 07af227..0b1c3fc 100644
--- a/server/routes/login.post.ts
+++ b/server/routes/login.post.ts
@@ -5,7 +5,7 @@ export default defineEventHandler(async (event) => {
 
     if ( !body.email || !body.password )
         throw createError({ statusCode: 400, message: "Bad form. Use e-mail and password" })
-
+    console.log(body)
     const req = await fetch(conf.fastapi_url + "/login",
         {
             method: "POST",
@@ -13,11 +13,27 @@ export default defineEventHandler(async (event) => {
                 "Content-Type": "application/json",
             },
             body: JSON.stringify({
-                email: body.email!,
-                pwd: body.password!,
+                email: body.email,
+                password: body.password,
             })
         }
     )
 
     if (!req.ok) throw createError({ statusCode: req.status })
+    else {
+        const body = await req.json();
+
+        await setUserSession(event,{
+            user: {
+                name: body.first_name,
+                surname: body.last_name,
+                email: body.email
+            },
+            private: {
+                user_id: body.id
+            }
+        })
+
+        return;
+    }
 })  
\ No newline at end of file
diff --git a/server/routes/logout.ts b/server/routes/logout.ts
index bc6887b..f82d0e7 100644
--- a/server/routes/logout.ts
+++ b/server/routes/logout.ts
@@ -1,3 +1,4 @@
-export default defineEventHandler((async) => {
-    
+export default defineEventHandler(async (event) => {
+    // log them out
+    await clearUserSession(event);
 })
\ No newline at end of file