diff --git a/accounts/ui/components/accounts/AccountsList.vue b/accounts/ui/components/accounts/AccountsList.vue
index f36113a134..2f2c236dac 100644
--- a/accounts/ui/components/accounts/AccountsList.vue
+++ b/accounts/ui/components/accounts/AccountsList.vue
@@ -3,13 +3,13 @@
     <oc-table middle divider>
       <oc-table-group>
         <oc-table-row class="fix-table-header">
-          <oc-table-cell shrink type="head">
+          <oc-table-cell shrink type="head" class="uk-text-center">
             <oc-checkbox
-              :value="areAllAccountsSelected"
-              :label="$gettext('Select all users')"
-              hide-label
-              @change="toggleSelectionAll"
-              class="uk-margin-small-left"
+                class="oc-ml-s"
+                :value="areAllAccountsSelected"
+                @input="toggleSelectionAll"
+                :label="$gettext('Select all users')"
+                hide-label
             />
           </oc-table-cell>
           <oc-table-cell shrink type="head" />
diff --git a/accounts/ui/components/accounts/AccountsListRow.vue b/accounts/ui/components/accounts/AccountsListRow.vue
index 12b995a6f2..e950d00879 100644
--- a/accounts/ui/components/accounts/AccountsListRow.vue
+++ b/accounts/ui/components/accounts/AccountsListRow.vue
@@ -2,10 +2,13 @@
   <oc-table-row>
     <oc-table-cell>
       <oc-checkbox
-        class="uk-margin-small-left"
-        :value="isAccountSelected"
-        @change="TOGGLE_SELECTION_ACCOUNT(account)"
-        :label="selectAccountLabel" hide-label
+        class="oc-ml-s"
+        size="large"
+        :value="selectedAccounts"
+        :option="account"
+        @input="TOGGLE_SELECTION_ACCOUNT(account)"
+        :label="selectAccountLabel"
+        hide-label
       />
     </oc-table-cell>
     <oc-table-cell>
@@ -95,10 +98,6 @@ export default {
     ...mapGetters(['user', 'configuration']),
     ...mapState('Accounts', ['roles', 'selectedAccounts']),
 
-    isAccountSelected () {
-      return this.selectedAccounts.indexOf(this.account) > -1
-    },
-
     selectAccountLabel () {
       const translated = this.$gettext('Select %{ account }')