diff --git a/src/components/settings_modal/admin_tabs/admin_card.vue b/src/components/settings_modal/admin_tabs/admin_card.vue
index 81cb04793..c191e9df1 100644
--- a/src/components/settings_modal/admin_tabs/admin_card.vue
+++ b/src/components/settings_modal/admin_tabs/admin_card.vue
@@ -81,7 +81,7 @@
                 class="main-button"
                 @click="confirmAction('confirmDeactivate')"
               >
-                {{ $t('admin_dash.users.deactivate') }}
+                {{ $t('admin_dash.users.actions.deactivate') }}
               </button>
             </div>
           </div>
@@ -91,7 +91,7 @@
                 class="main-button"
                 @click="confirmAction('confirmDeleteUser')"
               >
-                {{ $t('admin_dash.users.delete') }}
+                {{ $t('admin_dash.users.actions.delete_user') }}
               </button>
             </div>
           </div>
@@ -104,7 +104,7 @@
                 class="main-button"
                 @click="confirmAction('confirmGrantAdmin')"
               >
-                {{ $t('admin_dash.users.grant_admin') }}
+                {{ $t('admin_dash.users.actions.grant_admin') }}
               </button>
             </div>
           </div>
@@ -117,7 +117,7 @@
                 class="main-button"
                 @click="confirmAction('confirmRevokeAdmin')"
               >
-                {{ $t('admin_dash.users.revoke_admin') }}
+                {{ $t('admin_dash.users.actions.revoke_admin') }}
               </button>
             </div>
           </div>
@@ -130,7 +130,7 @@
                 class="main-button"
                 @click="confirmAction('confirmGrantModerator')"
               >
-                {{ $t('admin_dash.users.grant_moderator') }}
+                {{ $t('admin_dash.users.actions.grant_moderator') }}
               </button>
             </div>
           </div>
@@ -143,7 +143,7 @@
                 class="main-button"
                 @click="confirmAction('confirmRevokeModerator')"
               >
-                {{ $t('admin_dash.users.revoke_moderator') }}
+                {{ $t('admin_dash.users.actions.revoke_moderator') }}
               </button>
             </div>
           </div>
@@ -156,7 +156,7 @@
                 class="main-button"
                 @click="confirmAction('confirmApprove')"
               >
-                {{ $t('admin_dash.users.approve') }}
+                {{ $t('admin_dash.users.actions.approve') }}
               </button>
             </div>
           </div>
@@ -169,7 +169,7 @@
                 class="main-button"
                 @click="confirmAction('confirmConfirm')"
               >
-                {{ $t('admin_dash.users.confirm') }}
+                {{ $t('admin_dash.users.actions.confirm') }}
               </button>
             </div>
           </div>
@@ -179,7 +179,7 @@
                 class="main-button"
                 @click="confirmAction('confirmResendConfirmationEmail')"
               >
-                {{ $t('admin_dash.users.resend_confirmation_email') }}
+                {{ $t('admin_dash.users.actions.resend_confirmation_email') }}
               </button>
             </div>
           </div>
@@ -189,7 +189,7 @@
                 class="main-button"
                 @click="confirmAction('confirmRequirePasswordChange')"
               >
-                {{ $t('admin_dash.users.require_password_change') }}
+                {{ $t('admin_dash.users.actions.require_password_change') }}
               </button>
             </div>
           </div>
@@ -199,7 +199,7 @@
                 class="main-button"
                 @click="confirmAction('confirmDisableMFA')"
               >
-                {{ $t('admin_dash.users.disable_mfa') }}
+                {{ $t('admin_dash.users.actions.disable_mfa') }}
               </button>
             </div>
           </div>
@@ -397,105 +397,118 @@
   <GenericConfirm
     ref="confirmActivate"
     style="z-index: 10000;"
-    :title="$t('admin_dash.users.bulk_actions.activate')"
-    :cancel-text="$t('admin_dash.users.bulk_actions.no')"
-    :confirm-text="$t('admin_dash.users.bulk_actions.yes')"
+    :title="$t('admin_dash.users.actions.confirm_single.title')"
+    :message="$t('admin_dash.users.actions.confirm_single.activate')"
+    :cancel-text="$t('admin_dash.users.actions.no')"
+    :confirm-text="$t('admin_dash.users.actions.yes')"
     @action="userActionConfirmed('adminActivateUser')"
   />
   <GenericConfirm
     ref="confirmDeactivate"
     style="z-index: 10000;"
-    :title="$t('admin_dash.users.bulk_actions.deactivate')"
-    :cancel-text="$t('admin_dash.users.bulk_actions.no')"
-    :confirm-text="$t('admin_dash.users.bulk_actions.yes')"
+    :title="$t('admin_dash.users.actions.confirm_single.title')"
+    :message="$t('admin_dash.users.actions.confirm_single.deactivate')"
+    :cancel-text="$t('admin_dash.users.actions.no')"
+    :confirm-text="$t('admin_dash.users.actions.yes')"
     @action="userActionConfirmed('adminDeactivateUser')"
   />
   <GenericConfirm
     ref="confirmDeleteUser"
     style="z-index: 10000;"
-    :title="$t('admin_dash.users.bulk_actions.delete_user')"
-    :cancel-text="$t('admin_dash.users.bulk_actions.no')"
-    :confirm-text="$t('admin_dash.users.bulk_actions.yes')"
+    :title="$t('admin_dash.users.actions.confirm_single.title')"
+    :message="$t('admin_dash.users.actions.confirm_single.delete_user')"
+    :cancel-text="$t('admin_dash.users.actions.no')"
+    :confirm-text="$t('admin_dash.users.actions.yes')"
     @action="userActionConfirmed('adminDeleteUser')"
   />
   <GenericConfirm
     ref="confirmGrantAdmin"
     style="z-index: 10000;"
-    :title="$t('admin_dash.users.bulk_actions.grant_moderator')"
-    :cancel-text="$t('admin_dash.users.bulk_actions.no')"
-    :confirm-text="$t('admin_dash.users.bulk_actions.yes')"
+    :title="$t('admin_dash.users.actions.confirm_single.title')"
+    :message="$t('admin_dash.users.actions.confirm_single.grant_admin')"
+    :cancel-text="$t('admin_dash.users.actions.no')"
+    :confirm-text="$t('admin_dash.users.actions.yes')"
     @action="userActionConfirmed('adminAddUserToAdminGroup')"
   />
   <GenericConfirm
     ref="confirmRevokeAdmin"
     style="z-index: 10000;"
-    :title="$t('admin_dash.users.bulk_actions.revoke_admin')"
-    :cancel-text="$t('admin_dash.users.bulk_actions.no')"
-    :confirm-text="$t('admin_dash.users.bulk_actions.yes')"
+    :title="$t('admin_dash.users.actions.confirm_single.title')"
+    :message="$t('admin_dash.users.actions.confirm_single.revoke_admin')"
+    :cancel-text="$t('admin_dash.users.actions.no')"
+    :confirm-text="$t('admin_dash.users.actions.yes')"
     @action="userActionConfirmed('adminRemoveUserFromAdminGroup')"
   />
   <GenericConfirm
     ref="confirmGrantModerator"
     style="z-index: 10000;"
-    :title="$t('admin_dash.users.bulk_actions.grant_moderator')"
-    :cancel-text="$t('admin_dash.users.bulk_actions.no')"
-    :confirm-text="$t('admin_dash.users.bulk_actions.yes')"
+    :title="$t('admin_dash.users.actions.confirm_single.title')"
+    :message="$t('admin_dash.users.actions.confirm_single.grant_moderator')"
+    :cancel-text="$t('admin_dash.users.actions.no')"
+    :confirm-text="$t('admin_dash.users.actions.yes')"
     @action="userActionConfirmed('adminAddUserToModeratorGroup')"
   />
   <GenericConfirm
     ref="confirmRevokeModerator"
     style="z-index: 10000;"
-    :title="$t('admin_dash.users.bulk_actions.revoke_moderator')"
-    :cancel-text="$t('admin_dash.users.bulk_actions.no')"
-    :confirm-text="$t('admin_dash.users.bulk_actions.yes')"
+    :title="$t('admin_dash.users.actions.confirm_single.title')"
+    :message="$t('admin_dash.users.actions.confirm_single.revoke_moderator')"
+    :cancel-text="$t('admin_dash.users.actions.no')"
+    :confirm-text="$t('admin_dash.users.actions.yes')"
     @action="userActionConfirmed('adminRemoveUserFromModeratorGroup')"
   />
   <GenericConfirm
     ref="confirmApprove"
     style="z-index: 10000;"
-    :title="$t('admin_dash.users.bulk_actions.approve')"
-    :cancel-text="$t('admin_dash.users.bulk_actions.no')"
-    :confirm-text="$t('admin_dash.users.bulk_actions.yes')"
+    :title="$t('admin_dash.users.actions.confirm_single.title')"
+    :message="$t('admin_dash.users.actions.confirm_single.approve')"
+    :cancel-text="$t('admin_dash.users.actions.no')"
+    :confirm-text="$t('admin_dash.users.actions.yes')"
     @action="userActionConfirmed('adminApproveUser')"
   />
   <GenericConfirm
     ref="confirmConfirm"
     style="z-index: 10000;"
-    :title="$t('admin_dash.users.bulk_actions.confirm')"
-    :cancel-text="$t('admin_dash.users.bulk_actions.no')"
-    :confirm-text="$t('admin_dash.users.bulk_actions.yes')"
+    :title="$t('admin_dash.users.actions.confirm_single.title')"
+    :message="$t('admin_dash.users.actions.confirm_single.confirm')"
+    :cancel-text="$t('admin_dash.users.actions.no')"
+    :confirm-text="$t('admin_dash.users.actions.yes')"
     @action="userActionConfirmed('adminConfirmUser')"
   />
   <GenericConfirm
     ref="confirmResendConfirmationEmail"
     style="z-index: 10000;"
-    :title="$t('admin_dash.users.bulk_actions.resend_confirmation_email')"
-    :cancel-text="$t('admin_dash.users.bulk_actions.no')"
-    :confirm-text="$t('admin_dash.users.bulk_actions.yes')"
+    :title="$t('admin_dash.users.actions.confirm_single.title')"
+    :message="$t('admin_dash.users.actions.confirm_single.resend_confirmation_email')"
+    :cancel-text="$t('admin_dash.users.actions.no')"
+    :confirm-text="$t('admin_dash.users.actions.yes')"
     @action="userActionConfirmed('adminResendConfirmationEmail')"
   />
   <GenericConfirm
     ref="confirmRequirePasswordChange"
     style="z-index: 10000;"
-    :title="$t('admin_dash.users.bulk_actions.require_password_change')"
-    :cancel-text="$t('admin_dash.users.bulk_actions.no')"
-    :confirm-text="$t('admin_dash.users.bulk_actions.yes')"
+    :title="$t('admin_dash.users.actions.confirm_single.title')"
+    :message="$t('admin_dash.users.actions.confirm_single.require_password_change')"
+    :cancel-text="$t('admin_dash.users.actions.no')"
+    :confirm-text="$t('admin_dash.users.actions.yes')"
     @action="userActionConfirmed('adminRequirePasswordChange')"
   />
   <GenericConfirm
     ref="confirmDisableMFA"
     style="z-index: 10000;"
-    :title="$t('admin_dash.users.bulk_actions.disable_mfa')"
-    :cancel-text="$t('admin_dash.users.bulk_actions.no')"
-    :confirm-text="$t('admin_dash.users.bulk_actions.yes')"
+    :title="$t('admin_dash.users.actions.confirm_single.title')"
+    :message="$t('admin_dash.users.actions.confirm_single.disable_mfa')"
+    :cancel-text="$t('admin_dash.users.actions.no')"
+    :confirm-text="$t('admin_dash.users.actions.yes')"
     @action="userActionConfirmed('adminDisableMFA')"
   />
   <TextConfirm
     ref="addTextBox"
     style="z-index: 10001;"
-    :title="$t('admin_dash.users.tags.new_title')"
-    :cancel-text="$t('admin_dash.users.tags.no')"
-    :confirm-text="$t('admin_dash.users.tags.yes')"
+    :title="$t('admin_dash.users.tags.add_new')"
+    :message="$t('admin_dash.users.tags.new_title')"
+    :cancel-text="$t('admin_dash.users.actions.no')"
+    :confirm-text="$t('admin_dash.users.actions.yes')"
     @action="addUserTag"
   />
 </template>
diff --git a/src/components/settings_modal/admin_tabs/users_tab.js b/src/components/settings_modal/admin_tabs/users_tab.js
index f8bc83ea7..292a08368 100644
--- a/src/components/settings_modal/admin_tabs/users_tab.js
+++ b/src/components/settings_modal/admin_tabs/users_tab.js
@@ -134,6 +134,8 @@ const UsersTab = {
       const s = this.$refs.userList.getSelected()
       s.forEach(u => {
         if (restricted.includes(action) !== false || u.id !== this.$store.state.users.currentUser.id) {
+          const uf = this.$store.getters.findUser(u.id)
+          console.log('user: ', uf)
           this.$store.dispatch(action, this.$store.getters.findUser(u.id))
         }
       })
diff --git a/src/components/settings_modal/admin_tabs/users_tab.vue b/src/components/settings_modal/admin_tabs/users_tab.vue
index 17e2cc9fd..19f31757f 100644
--- a/src/components/settings_modal/admin_tabs/users_tab.vue
+++ b/src/components/settings_modal/admin_tabs/users_tab.vue
@@ -335,7 +335,7 @@
     <GenericConfirm
       ref="confirmDisableMFA"
       :title="$t('admin_dash.users.actions.confirm_multi.title')"
-      :message="$t('admin_dash.users.actions.disable_mfa')"
+      :message="$t('admin_dash.users.actions.confirm_multi.disable_mfa')"
       :cancel-text="$t('admin_dash.users.actions.no')"
       :confirm-text="$t('admin_dash.users.actions.yes')"
       @action="selectionConfirmed('adminDisableMFA')"
diff --git a/src/modules/adminSettings.js b/src/modules/adminSettings.js
index 9086a265d..0be39f042 100644
--- a/src/modules/adminSettings.js
+++ b/src/modules/adminSettings.js
@@ -114,8 +114,8 @@ const adminSettingsStorage = {
     adminChangeStatusScope (store, { opts }) {
        return store.rootState.api.backendInteractor.adminChangeStatusScope({ opts })
     },
-    adminDisableMFA (store, { opts }) {
-      return store.rootState.api.backendInteractor.adminDisableMFA({ opts })
+    adminDisableMFA (store, user) {
+      return store.rootState.api.backendInteractor.adminDisableMFA({ user })
     },
     adminTagUser (store, { user, tag }) {
       return store.rootState.api.backendInteractor.tagUser({ user, tag })