diff --git a/src/contexts/Auth/AuthState.jsx b/src/contexts/Auth/AuthState.jsx
index 1cdd6014fabca1a831f62d8543120d9c7d348daf..277791613993e43a69be20da23786cb50ef7b198 100755
--- a/src/contexts/Auth/AuthState.jsx
+++ b/src/contexts/Auth/AuthState.jsx
@@ -32,18 +32,19 @@ function AuthState({ children }) {
       { withCredentials: true }
     );
     // set current user to login and merge accessToken into currentUser
-    dispatchCurrentUser({ type: USER_ACTIONS.SET, payload: { ...result.data.record } });
-    setAccessToken(result.data.token);
+    dispatchCurrentUser({ type: USER_ACTIONS.SET, payload: { ...result.data.document } });
+    setAccessToken(result.data.accessToken);
     // TODO: don't store accessToken in localStorage, keep in memory only
-    localStorage.setItem("accessToken", JSON.stringify(result.data.token));
+    localStorage.setItem("accessToken", JSON.stringify(result.data.accessToken));
     return result;
   }
 
   // ### HANDLE LOGOUT
   async function logout() {
     dispatchCurrentUser({ type: USER_ACTIONS.DROP });
-    const result = await api.get(
-      '/users/logout',
+    const result = await api.delete(
+      '/auth',
+      { withCredentials: true }
     );
     return result;
   }
diff --git a/src/pages/User/Logout.jsx b/src/pages/User/Logout.jsx
index 92358a3e6c981fe8057ddbf85341f92d77a02cce..b7631e83e6350d6fc7ebdb35676420b3b8159483 100644
--- a/src/pages/User/Logout.jsx
+++ b/src/pages/User/Logout.jsx
@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useAuth } from '../../contexts/Auth/AuthState';
-import { mergeBackendValidation, setFlashMsg } from '../../utils/ErrorHandling';
+import { setFlashMsg } from '../../utils/ErrorHandling';
 
 function Logout() {
   // #################################
@@ -25,8 +25,8 @@ function Logout() {
     try {
       const result = await logout();
       redirect('/login');
-      // set flash mmessagesg
-      setFlashMsg(result.data?.message);
+      // set flash msg
+      setFlashMsg(result.data?.msg);
     } catch (err) {
       mergeBackendValidation(500, err);
     }