diff --git a/src/store/modules/AccessControl/LocalUserMangementStore.js b/src/store/modules/AccessControl/LocalUserMangementStore.js
index de79a2d..815c166 100644
--- a/src/store/modules/AccessControl/LocalUserMangementStore.js
+++ b/src/store/modules/AccessControl/LocalUserMangementStore.js
@@ -1,4 +1,4 @@
-import api from "../../api";
+import api from '../../api';
 
 const LocalUserManagementStore = {
   namespaced: true,
@@ -18,12 +18,12 @@
   actions: {
     getUsers({ commit }) {
       api
-        .get("/redfish/v1/AccountService/Accounts")
-        .then(response => response.data.Members.map(user => user["@odata.id"]))
+        .get('/redfish/v1/AccountService/Accounts')
+        .then(response => response.data.Members.map(user => user['@odata.id']))
         .then(userIds => api.all(userIds.map(user => api.get(user))))
         .then(users => {
           const userData = users.map(user => user.data);
-          commit("setUsers", userData);
+          commit('setUsers', userData);
         })
         .catch(error => console.log(error));
     },
@@ -35,8 +35,8 @@
         Enabled: status
       };
       api
-        .post("/redfish/v1/AccountService/Accounts", data)
-        .then(() => dispatch("getUsers"))
+        .post('/redfish/v1/AccountService/Accounts', data)
+        .then(() => dispatch('getUsers'))
         .catch(error => console.log(error));
     },
     updateUser(
@@ -50,13 +50,13 @@
       if (status !== undefined) data.Enabled = status;
       api
         .patch(`/redfish/v1/AccountService/Accounts/${originalUsername}`, data)
-        .then(() => dispatch("getUsers"))
+        .then(() => dispatch('getUsers'))
         .catch(error => console.log(error));
     },
     deleteUser({ dispatch }, username) {
       api
         .delete(`/redfish/v1/AccountService/Accounts/${username}`)
-        .then(() => dispatch("getUsers"))
+        .then(() => dispatch('getUsers'))
         .catch(error => console.log(error));
     }
   }
