diff --git a/dashboard/public/translation/en.json b/dashboard/public/translation/en.json
index 311067f69..ef0e73f8f 100644
--- a/dashboard/public/translation/en.json
+++ b/dashboard/public/translation/en.json
@@ -46,7 +46,8 @@
             "add": "Add",
             "next": "Next",
             "configure": "Configure",
-            "restart": "Restart"
+            "restart": "Restart",
+            "reset": "Reset"
         },
         "rebootDialog": {
             "title": "Reboot Server",
@@ -255,7 +256,11 @@
             "title": "LDAP Server",
             "enabled": "Enable LDAP server"
         },
-        "title": "Users"
+        "title": "Users",
+        "2FAResetDialog": {
+            "title": "Reset 2FA",
+            "description": "Remove the existing 2FA setup for user “{{ username }}”?"
+        }
     },
     "profile": {
         "title": "Profile",
diff --git a/dashboard/src/components/UserDialog.vue b/dashboard/src/components/UserDialog.vue
index ca61662ff..063920ae7 100644
--- a/dashboard/src/components/UserDialog.vue
+++ b/dashboard/src/components/UserDialog.vue
@@ -32,7 +32,6 @@ const roles = ref([]);
 const profile = ref({});
 const busy = ref(false);
 const profileLocked = ref(false);
-const external2FA = ref(false);
 const formError = ref({});
 const displayName = ref('');
 const email = ref('');
@@ -46,19 +45,6 @@ const allLocalGroups = ref([]);
 const active = ref(true);
 const sendInvite = ref(false);
 const isSelf = ref(false);
-const reset2FABusy = ref(false);
-
-async function onReset2FA() {
-  if (!user.value) return;
-
-  reset2FABusy.value = true;
-
-  const [error] = await usersModel.disableTwoFactorAuthentication(user.value.id);
-  if (error) return console.error(error);
-
-  user.value.twoFactorAuthenticationEnabled = false;
-  reset2FABusy.value = false;
-}
 
 let avatarFile = 'src';
 function onAvatarChanged(file) {
@@ -220,7 +206,6 @@ defineExpose({
     [error, result] = await dashboardModel.config();
     if (error) return console.error(error);
     profileLocked.value = result.profileLocked;
-    external2FA.value = result.external2FA;
 
     imagePicker.value.reset();
     dialog.value.open();
@@ -238,10 +223,6 @@ defineExpose({
      reject-style="secondary"
     :reject-label="$t('main.dialog.cancel')"
     :reject-active="!busy"
-     alternate-style="secondary"
-    :alternate-label="(user && user.twoFactorAuthenticationEnabled && !(user.source && external2FA)) ? $t('users.passwordResetDialog.reset2FAAction') : null"
-    :alternate-busy="reset2FABusy"
-    @alternate="onReset2FA()"
     @confirm="onSubmit()"
   >
     <form @submit.prevent="onSubmit()" autocomplete="off" ref="form" @input="validateForm()">
diff --git a/dashboard/src/views/UsersView.vue b/dashboard/src/views/UsersView.vue
index 5d2d20806..e1711a221 100644
--- a/dashboard/src/views/UsersView.vue
+++ b/dashboard/src/views/UsersView.vue
@@ -15,10 +15,12 @@ import PasswordResetDialog from '../components/PasswordResetDialog.vue';
 import UsersModel from '../models/UsersModel.js';
 import GroupsModel from '../models/GroupsModel.js';
 import ProfileModel from '../models/ProfileModel.js';
+import DashboardModel from '../models/DashboardModel.js';
 
 const usersModel = UsersModel.create();
 const groupsModel = GroupsModel.create();
 const profileModel = ProfileModel.create();
+const dashboardModel = DashboardModel.create();
 
 const usersColumns = {
   role: {
@@ -52,6 +54,12 @@ function onUserActionMenu(user, event) {
     visible: !user.inviteAccepted && !isMe(user) && !user.source,
     disabled: !canEdit(user),
     action: onInvitation.bind(null, user),
+  }, {
+    icon: 'fa-solid fa-qrcode',
+    label: t('users.passwordResetDialog.reset2FAAction'),
+    visible: user.twoFactorAuthenticationEnabled && !(user.source && external2FA),
+    disabled: !canEdit(user),
+    action: on2FAReset.bind(null, user),
   }, {
     icon: 'fa-solid fa-key',
     label: t('users.users.resetPasswordTooltip'),
@@ -75,6 +83,7 @@ function onUserActionMenu(user, event) {
   actionMenuElement.value.open(event, event.currentTarget);
 }
 
+const external2FA = ref(false);
 const profile = ref({});
 const busy = ref(true);
 const filterOptions = ref([
@@ -167,6 +176,24 @@ function onPasswordReset(user) {
   passwordResetDialog.value.open(user);
 }
 
+async function on2FAReset(user) {
+  const yes = await inputDialog.value.confirm({
+    title: t('users.2FAResetDialog.title'),
+    message: t('users.2FAResetDialog.description', { username: (user.username || user.email) }),
+    confirmStyle: 'danger',
+    confirmLabel: t('main.action.reset'),
+    rejectLabel: t('main.dialog.cancel'),
+    rejectStyle: 'secondary'
+  });
+
+  if (!yes) return;
+
+  const [error] = await usersModel.disableTwoFactorAuthentication(user.id);
+  if (error) return console.error(error);
+
+  user.twoFactorAuthenticationEnabled = false;
+}
+
 function onEditOrAddUser(user = null) {
   if (user || features.value.userMaxCount > users.value.length) userDialog.value.open(user);
   else subscriptionRequiredDialog.value.open();
@@ -196,7 +223,7 @@ async function onRemoveUser(user) {
 }
 
 onMounted(async () => {
-  const [error, result] = await profileModel.get();
+  let [error, result] = await profileModel.get();
   if (error) return console.error(error);
 
   profile.value = result;
@@ -213,6 +240,10 @@ onMounted(async () => {
     { id: 'owner', name: t('users.role.owner'), disabled: !profile.value.isAtLeastOwner }
   ];
 
+    [error, result] = await dashboardModel.config();
+    if (error) return console.error(error);
+    external2FA.value = result.external2FA;
+
   busy.value = false;
 });