diff --git a/ui/components/accounts/AccountsListRow.vue b/ui/components/accounts/AccountsListRow.vue
index dab464095..d2e53bb92 100644
--- a/ui/components/accounts/AccountsListRow.vue
+++ b/ui/components/accounts/AccountsListRow.vue
@@ -42,8 +42,8 @@
     <oc-table-cell v-text="account.uidNumber || '-'" />
     <oc-table-cell v-text="account.gidNumber || '-'" />
     <oc-table-cell class="uk-text-center">
-      <oc-icon v-if="account.accountEnabled" name="ready" variation="success" :aria-label="$gettext('Account is enabled')" />
-      <oc-icon v-else name="deprecated" variation="danger" :aria-label="$gettext('Account is disabled')" />
+      <oc-icon v-if="account.accountEnabled" key="account-icon-enabled" name="ready" variation="success" :aria-label="$gettext('Account is enabled')" />
+      <oc-icon v-else name="deprecated" key="account-icon-disabled" variation="danger" :aria-label="$gettext('Account is disabled')" />
     </oc-table-cell>
   </oc-table-row>
 </template>
diff --git a/ui/store/index.js b/ui/store/index.js
index 82f769066..0a2517df5 100644
--- a/ui/store/index.js
+++ b/ui/store/index.js
@@ -46,6 +46,16 @@ const mutations = {
   },
   SET_SELECTED_ACCOUNTS (state, accounts) {
     state.selectedAccounts = accounts
+  },
+
+  UPDATE_ACCOUNT (state, updatedAccount) {
+    const accountIndex = state.accounts.findIndex(account => account.id === updatedAccount.id)
+
+    state.accounts.splice(accountIndex, 1, updatedAccount)
+  },
+
+  RESET_ACCOUNTS_SELECTION (state) {
+    state.selectedAccounts = []
   }
 }
 
@@ -103,19 +113,32 @@ const actions = {
     getters.areAllAccountsSelected ? commit('SET_SELECTED_ACCOUNTS', []) : commit('SET_SELECTED_ACCOUNTS', [...state.accounts])
   },
 
-  async enableAccounts ({ dispatch, rootGetters }, accounts) {
+  async enableAccounts ({ commit, dispatch, state, rootGetters }) {
     const failedAccounts = []
     injectAuthToken(rootGetters.user.token)
 
-    for (const account in accounts) {
+    for (const account of state.selectedAccounts) {
+      if (account.accountEnabled) {
+        continue
+      }
+
       const response = await AccountsService_UpdateAccount({
         $domain: rootGetters.configuration.server,
         body: {
-          account: account
+          account: {
+            id: account.id,
+            accountEnabled: true
+          },
+          update_mask: {
+            paths: ['AccountEnabled']
+          }
         }
       })
 
-      if (response.status !== 201) {
+      if (response.status === 201) {
+        console.log('Going to update')
+        commit('UPDATE_ACCOUNT', { ...account, accountEnabled: true })
+      } else {
         failedAccounts.push({ account: account.diisplayName, statusText: response.statusText })
       }
     }
@@ -135,21 +158,35 @@ const actions = {
         status: 'danger'
       }, { root: true })
     }
+
+    commit('RESET_ACCOUNTS_SELECTION')
   },
 
-  async disableAccounts ({ dispatch, state, rootGetters }) {
+  async disableAccounts ({ commit, dispatch, state, rootGetters }) {
     const failedAccounts = []
     injectAuthToken(rootGetters.user.token)
 
     for (const account of state.selectedAccounts) {
+      if (!account.accountEnabled) {
+        continue
+      }
+
       const response = await AccountsService_UpdateAccount({
         $domain: rootGetters.configuration.server,
         body: {
-          account: account
+          account: {
+            id: account.id,
+            accountEnabled: false
+          },
+          update_mask: {
+            paths: ['AccountEnabled']
+          }
         }
       })
 
-      if (response.status !== 201) {
+      if (response.status === 201) {
+        commit('UPDATE_ACCOUNT', { ...account, accountEnabled: false })
+      } else {
         failedAccounts.push({ account: account.diisplayName, statusText: response.statusText })
       }
     }
@@ -169,6 +206,8 @@ const actions = {
         status: 'danger'
       }, { root: true })
     }
+
+    commit('RESET_ACCOUNTS_SELECTION')
   }
 }