diff --git a/frontend/src/stores/useAuthStore.jsx b/frontend/src/stores/useAuthStore.jsx
index 42b51a2cce..3119513409 100644
--- a/frontend/src/stores/useAuthStore.jsx
+++ b/frontend/src/stores/useAuthStore.jsx
@@ -1,106 +1,85 @@
 import axios from "axios";
 import { create } from "zustand";
-
 import { addToast } from "@certego/certego-ui";
-
 import Cookies from "js-cookie";
 import { USERACCESS_URI, AUTH_BASE_URI } from "../constants/apiURLs";
 
-// constants
+// Constants
 const CSRF_TOKEN = "csrftoken";
 
-// hook/ store see: https://github.com/pmndrs/zustand
-export const useAuthStore = create((set, get) => ({
-  loading: false,
-  CSRFToken: Cookies.get(CSRF_TOKEN) || "",
-  user: {
-    username: "",
-    full_name: "",
-    first_name: "",
-    last_name: "",
-    email: "",
-    is_staff: false,
-  },
-  access: null,
-  isAuthenticated: () => !!get().CSRFToken,
-  updateToken: () => set({ CSRFToken: Cookies.get(CSRF_TOKEN) }),
-  deleteToken: () => set({ CSRFToken: "" }),
-  service: {
-    fetchUserAccess: async () => {
-      try {
-        const resp = await axios.get(USERACCESS_URI, {
-          certegoUIenableProgressBar: false,
-        });
-        set({
-          user: resp.data.user,
-          access: resp.data.access,
-        });
-      } catch (err) {
-        addToast(
-          "Error fetching user access information!",
-          err.parsedMsg,
-          "danger",
-        );
-      }
-    },
-    loginUser: async (body) => {
-      try {
-        set({ loading: true });
-        const resp = await axios.post(`${AUTH_BASE_URI}/login`, body, {
-          certegoUIenableProgressBar: false,
-        });
-        get().updateToken();
-        addToast("You've been logged in!", null, "success");
-        return Promise.resolve(resp);
-      } catch (err) {
-        addToast("Login failed!", err.parsedMsg, "danger", true);
-        return Promise.reject(err);
-      } finally {
-        set({ loading: false });
-      }
-    },
-    logoutUser: async () => {
+// Auth Store
+export const useAuthStore = create((set, get) => {
+  const updateToken = () => set({ CSRFToken: Cookies.get(CSRF_TOKEN) || "" });
+  const deleteToken = () => {
+    Cookies.remove(CSRF_TOKEN);
+    set({ CSRFToken: "" });
+  };
+
+  const handleRequest = async (request, successMsg, errorMsg) => {
+    try {
       set({ loading: true });
-      const onLogoutCb = () => {
-        get().deleteToken();
-        // rmeove from the browser or it will persist next time we open a tab
-        Cookies.remove(CSRF_TOKEN);
-        set({ loading: false });
-        addToast("Logged out!", null, "info");
-      };
-      return axios
-        .post(`${AUTH_BASE_URI}/logout`, null, {
-          certegoUIenableProgressBar: false,
-        })
-        .then(onLogoutCb)
-        .catch(onLogoutCb);
-    },
-    forceLogout: () => {
-      addToast(
-        "Invalid token. You will be logged out shortly",
-        null,
-        "spinner",
-        true,
-        1000,
-      );
-      return setTimeout(get().service.logoutUser, 500);
+      const response = await request();
+      if (successMsg) addToast(successMsg, null, "success");
+      return response;
+    } catch (err) {
+      if (errorMsg) addToast(errorMsg, err.parsedMsg, "danger", true);
+      return Promise.reject(err);
+    } finally {
+      set({ loading: false });
+    }
+  };
+
+  return {
+    loading: false,
+    CSRFToken: Cookies.get(CSRF_TOKEN) || "",
+    user: {
+      username: "",
+      full_name: "",
+      first_name: "",
+      last_name: "",
+      email: "",
+      is_staff: false,
     },
-    changePassword: async (values) => {
-      try {
-        set({ loading: true });
-        const resp = await axios.post(
-          `${AUTH_BASE_URI}/changepassword`,
-          values,
-          {
+    access: null,
+    isAuthenticated: () => !!get().CSRFToken,
+    updateToken,
+    deleteToken,
+    service: {
+      fetchUserAccess: async () => {
+        try {
+          const { data } = await axios.get(USERACCESS_URI, {
             certegoUIenableProgressBar: false,
-          },
-        );
-        return Promise.resolve(resp);
-      } catch (err) {
-        return Promise.reject(err);
-      } finally {
-        set({ loading: false });
-      }
+          });
+          set({ user: data.user, access: data.access });
+        } catch (err) {
+          addToast("Error fetching user access information!", err.parsedMsg, "danger");
+        }
+      },
+      loginUser: (body) =>
+        handleRequest(
+          () => axios.post(`${AUTH_BASE_URI}/login`, body, { certegoUIenableProgressBar: false }),
+          "You've been logged in!",
+          "Login failed!"
+        ).then(() => get().updateToken()),
+      logoutUser: async () => {
+        set({ loading: true });
+        const onLogoutCb = () => {
+          deleteToken();
+          addToast("Logged out!", null, "info");
+          set({ loading: false });
+        };
+        return axios.post(`${AUTH_BASE_URI}/logout`, null, { certegoUIenableProgressBar: false }).then(onLogoutCb).catch(onLogoutCb);
+      },
+      forceLogout: () => {
+        addToast("Invalid token. You will be logged out shortly", null, "spinner", true, 1000);
+        setTimeout(get().service.logoutUser, 500);
+      },
+      changePassword: (values) =>
+        handleRequest(
+          () => axios.post(`${AUTH_BASE_URI}/changepassword`, values, { certegoUIenableProgressBar: false }),
+          null,
+          "Password change failed!"
+        ),
     },
-  },
-}));
+  };
+});