diff --git a/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue b/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue
index 6a8300b..bc2200e 100644
--- a/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue
+++ b/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue
@@ -59,18 +59,18 @@
 </template>
 
 <script>
-import IconTrashcan from "@carbon/icons-vue/es/trash-can/20";
-import IconEdit from "@carbon/icons-vue/es/edit/20";
-import IconAdd from "@carbon/icons-vue/es/add--alt/20";
-import IconSettings from "@carbon/icons-vue/es/settings/20";
+import IconTrashcan from '@carbon/icons-vue/es/trash-can/20';
+import IconEdit from '@carbon/icons-vue/es/edit/20';
+import IconAdd from '@carbon/icons-vue/es/add--alt/20';
+import IconSettings from '@carbon/icons-vue/es/settings/20';
 
-import TableRoles from "./TableRoles";
-import ModalUser from "./ModalUser";
-import ModalSettings from "./ModalSettings";
-import PageTitle from "../../../components/Global/PageTitle";
+import TableRoles from './TableRoles';
+import ModalUser from './ModalUser';
+import ModalSettings from './ModalSettings';
+import PageTitle from '../../../components/Global/PageTitle';
 
 export default {
-  name: "local-users",
+  name: 'local-users',
   components: {
     IconAdd,
     IconEdit,
@@ -92,7 +92,7 @@
   },
   computed: {
     allUsers() {
-      return this.$store.getters["localUsers/allUsers"];
+      return this.$store.getters['localUsers/allUsers'];
     },
     tableItems() {
       // transform user data to table data
@@ -101,13 +101,13 @@
           username: user.UserName,
           privilege: user.RoleId,
           status: user.Locked
-            ? "Locked"
+            ? 'Locked'
             : user.Enabled
-            ? "Enabled"
-            : "Disabled",
+            ? 'Enabled'
+            : 'Disabled',
           actions: {
             edit: true,
-            delete: user.UserName === "root" ? false : true
+            delete: user.UserName === 'root' ? false : true
           }
         };
       });
@@ -115,19 +115,19 @@
   },
   methods: {
     getUsers() {
-      this.$store.dispatch("localUsers/getUsers");
+      this.$store.dispatch('localUsers/getUsers');
     },
     initModalUser(user) {
       this.activeUser = user;
-      this.$bvModal.show("modal-user");
+      this.$bvModal.show('modal-user');
     },
     initModalDelete(user) {
       this.$bvModal
         .msgBoxConfirm(
           `Are you sure you want to delete user '${user.username}'? This action cannot be undone.`,
           {
-            title: "Delete user",
-            okTitle: "Delete user"
+            title: 'Delete user',
+            okTitle: 'Delete user'
           }
         )
         .then(deleteConfirmed => {
@@ -138,20 +138,20 @@
     },
     initModalSettings() {
       if (this.settings) {
-        this.$bvModal.show("modal-settings");
+        this.$bvModal.show('modal-settings');
       } else {
         // fetch settings then show modal
       }
     },
     saveUser({ newUser, form }) {
       if (newUser) {
-        this.$store.dispatch("localUsers/createUser", form);
+        this.$store.dispatch('localUsers/createUser', form);
       } else {
-        this.$store.dispatch("localUsers/updateUser", form);
+        this.$store.dispatch('localUsers/updateUser', form);
       }
     },
     deleteUser({ username }) {
-      this.$store.dispatch("localUsers/deleteUser", username);
+      this.$store.dispatch('localUsers/deleteUser', username);
     },
     clearActiveUser() {
       this.activeUser = null;
