diff --git a/dashboard/public/translation/cs.json b/dashboard/public/translation/cs.json
index 1d4bab8d5..999b5e4af 100644
--- a/dashboard/public/translation/cs.json
+++ b/dashboard/public/translation/cs.json
@@ -348,8 +348,6 @@
             "allowedIpRanges": "Povolený rozsah IP adres"
         },
         "changePasswordAction": "Změnit heslo",
-        "disable2FAAction": "Zakázat 2FA",
-        "enable2FAAction": "Povolit 2FA",
         "passwordResetNotification": {
             "body": "E-mail odeslán na {{ email }}"
         },
@@ -363,7 +361,6 @@
         },
         "twoFactorAuth": {
             "title": "Dvoufaktorová autentizace",
-            "disabled": "Zakázáno",
             "totpEnabled": "Použít časově omezené jednorázové heslo (TOTP)",
             "passkeyEnabled": "Použít passkey"
         }
diff --git a/dashboard/public/translation/da.json b/dashboard/public/translation/da.json
index 006d084a8..39b77e414 100644
--- a/dashboard/public/translation/da.json
+++ b/dashboard/public/translation/da.json
@@ -296,8 +296,6 @@
             "password": "Adgangskode til bekræftelse"
         },
         "changePasswordAction": "Ændre adgangskode",
-        "disable2FAAction": "Deaktivere 2FA",
-        "enable2FAAction": "Aktiver 2FA",
         "passwordResetNotification": {
             "body": "E-mail sendt til {{ email }}"
         }
diff --git a/dashboard/public/translation/de.json b/dashboard/public/translation/de.json
index 8ed677316..fe64f7473 100644
--- a/dashboard/public/translation/de.json
+++ b/dashboard/public/translation/de.json
@@ -366,8 +366,6 @@
             "description": "App-Passwörter sind eine Sicherheitsmaßnahme zum Schutz des Cloudron-User-Kontos. Sobald eingerichtet, kann die Anmeldung (zusätzlich) mit dem Usernamen und dem hier angezeigtem Passwort erfolgen. Hinweis: sinnvoll bei nicht vertrauenswürdigen mobilen Anwendungen oder Desktop-Clients.",
             "title": "App-Passwörter"
         },
-        "enable2FAAction": "2FA aktivieren",
-        "disable2FAAction": "2FA deaktivieren",
         "changePasswordAction": "Passwort ändern",
         "createApiToken": {
             "copyNow": "API-Token kopieren. Hinweis: keine erneute Anzeige des API-Tokens.",
diff --git a/dashboard/public/translation/en.json b/dashboard/public/translation/en.json
index 3f4fdfeaf..6042599d9 100644
--- a/dashboard/public/translation/en.json
+++ b/dashboard/public/translation/en.json
@@ -48,7 +48,9 @@
             "configure": "Configure",
             "restart": "Restart",
             "reset": "Reset",
-            "loadMore": "Load more"
+            "loadMore": "Load more",
+            "setup": "Set up",
+            "disable": "Disable"
         },
         "rebootDialog": {
             "title": "Reboot Server",
@@ -348,8 +350,6 @@
             "allowedIpRanges": "Allowed IP range(s)"
         },
         "changePasswordAction": "Change password",
-        "disable2FAAction": "Disable 2FA",
-        "enable2FAAction": "Enable 2FA",
         "passwordResetNotification": {
             "body": "Email sent to {{ email }}"
         },
@@ -363,9 +363,17 @@
         },
         "twoFactorAuth": {
             "title": "Two-factor authentication",
-            "disabled": "Disabled",
-            "totpEnabled": "Using time-based one-time password (TOTP)",
-            "passkeyEnabled": "Using passkey"
+            "totpEnabled": "Enabled",
+            "passkeyEnabled": "Enabled",
+            "totpTitle": "TOTP",
+            "passkeyTitle": "Passkey"
+        },
+        "notSet": "Not set",
+        "enablePasskey": {
+            "title": "Enable passkey"
+        },
+        "enableTotp": {
+            "title": "Enable TOTP"
         }
     },
     "backups": {
diff --git a/dashboard/public/translation/es.json b/dashboard/public/translation/es.json
index 79f588b73..ff8163bb0 100644
--- a/dashboard/public/translation/es.json
+++ b/dashboard/public/translation/es.json
@@ -402,8 +402,6 @@
         "useFileEncryption": "Se usa cifrado de archivos"
     },
     "profile": {
-        "enable2FAAction": "Habilita 2FA",
-        "disable2FAAction": "Deshabilita 2FA",
         "changePasswordAction": "Cambiar contraseña",
         "createApiToken": {
             "copyNow": "Por favor copia el token API ahora. No se volverá a mostrar por motivos de seguridad.",
diff --git a/dashboard/public/translation/fr.json b/dashboard/public/translation/fr.json
index 2686b37dc..4dba94d53 100644
--- a/dashboard/public/translation/fr.json
+++ b/dashboard/public/translation/fr.json
@@ -263,8 +263,6 @@
             "title": "Jetons de connexion",
             "description": "Vous avez {{ webadminTokens.length }} jeton(s) web actif(s) et {{ cliTokens.length }} jeton(s) CLI."
         },
-        "disable2FAAction": "Désactiver l'authentification à deux facteurs (2FA)",
-        "enable2FAAction": "Activer l'authentification à deux facteurs (2FA)",
         "passwordResetNotification": {
             "body": "Email envoyé à {{ email }}"
         }
diff --git a/dashboard/public/translation/id.json b/dashboard/public/translation/id.json
index 11188fee5..4f4eca11f 100644
--- a/dashboard/public/translation/id.json
+++ b/dashboard/public/translation/id.json
@@ -326,8 +326,6 @@
             "copyNow": "Silakan salin kata sandi sekarang. Kata sandi ini tidak akan ditampilkan lagi untuk alasan keamanan.",
             "expiresAt": "Tanggal kedaluwarsa"
         },
-        "disable2FAAction": "Nonaktifkan 2FA",
-        "enable2FAAction": "Aktifkan 2FA",
         "title": "Profil",
         "primaryEmail": "E-mail utama",
         "passwordRecoveryEmail": "E-mail pemulihan kata sandi",
@@ -363,7 +361,6 @@
         },
         "twoFactorAuth": {
             "title": "Autentikasi dua faktor",
-            "disabled": "Dinonaktifkan",
             "totpEnabled": "Menggunakan kata sandi sekali pakai berbasis waktu (TOTP)",
             "passkeyEnabled": "Menggunakan passkey"
         }
diff --git a/dashboard/public/translation/it.json b/dashboard/public/translation/it.json
index 728cfb6cf..5851c9f17 100644
--- a/dashboard/public/translation/it.json
+++ b/dashboard/public/translation/it.json
@@ -560,8 +560,6 @@
         "title": "Backup"
     },
     "profile": {
-        "enable2FAAction": "Abilita 2FA",
-        "disable2FAAction": "Disabilita 2FA",
         "changePasswordAction": "Cambia Password",
         "createApiToken": {
             "copyNow": "Copia il token API ora. Non verrà mostrato di nuovo per motivi di sicurezza.",
diff --git a/dashboard/public/translation/nl.json b/dashboard/public/translation/nl.json
index cdd133d06..791acd040 100644
--- a/dashboard/public/translation/nl.json
+++ b/dashboard/public/translation/nl.json
@@ -348,8 +348,6 @@
             "allowedIpRanges": "Toegestane IP range(s)"
         },
         "changePasswordAction": "Verander Wachtwoord",
-        "disable2FAAction": "Twee-Factor (2FA) authenticatie uitschakelen",
-        "enable2FAAction": "Twee-Factor (2FA) authenticatie inschakelen",
         "passwordResetNotification": {
             "body": "E-mail gestuurd naar {{ email }}"
         },
@@ -363,7 +361,6 @@
         },
         "twoFactorAuth": {
             "title": "Twee-Factor (2FA) authenticatie",
-            "disabled": "Uitgeschakeld",
             "totpEnabled": "Gebruikt tijdgebaseerd eenmalige wachtwoord (TOTP)",
             "passkeyEnabled": "Gebruikt passkey"
         }
diff --git a/dashboard/public/translation/pt.json b/dashboard/public/translation/pt.json
index 4f3c5d3c0..382beb496 100644
--- a/dashboard/public/translation/pt.json
+++ b/dashboard/public/translation/pt.json
@@ -180,8 +180,6 @@
             "description": "As palavras-passe da aplicação são uma medida de segurança para proteger a sua conta de utilizador Cloudron. Se precisar de aceder a uma aplicação Cloudron a partir de uma aplicação móvel ou cliente não fidedigno, pode iniciar a sessão com o seu nome de utilizador e a palavra-passe alternativa gerada aqui."
         },
         "changePasswordAction": "Alterar palavra-passe",
-        "disable2FAAction": "Desativar 2FA",
-        "enable2FAAction": "Ativar 2FA",
         "removeAppPassword": {
             "title": "Remover Palavra-passe da Aplicação",
             "description": "Remover a palavra-passe da aplicação \"{{ name }}\"?"
diff --git a/dashboard/public/translation/ru.json b/dashboard/public/translation/ru.json
index e6a917bab..07514781e 100644
--- a/dashboard/public/translation/ru.json
+++ b/dashboard/public/translation/ru.json
@@ -348,8 +348,6 @@
             "allowedIpRanges": "Разрешённые диапазоны IP"
         },
         "changePasswordAction": "Изменить пароль",
-        "disable2FAAction": "Выключить 2FA",
-        "enable2FAAction": "Включить 2FA",
         "passwordResetNotification": {
             "body": "Письмо отправлено на адрес электронной почты {{ email }}"
         },
@@ -363,7 +361,6 @@
         },
         "twoFactorAuth": {
             "title": "Двухфакторная аутентификация",
-            "disabled": "Выключено",
             "totpEnabled": "Используется одноразовый пароль (TOTP)",
             "passkeyEnabled": "Используется ключ доступа"
         }
diff --git a/dashboard/public/translation/vi.json b/dashboard/public/translation/vi.json
index 759e99dc1..13ad066ac 100644
--- a/dashboard/public/translation/vi.json
+++ b/dashboard/public/translation/vi.json
@@ -291,7 +291,6 @@
             "access": "Truy cập API",
             "allowedIpRanges": "Dãy IP cho phép"
         },
-        "enable2FAAction": "Bật xác minh hai bước",
         "primaryEmail": "Email chính",
         "passwordRecoveryEmail": "Email khôi phục mật khẩu",
         "appPasswords": {
@@ -324,7 +323,6 @@
             "email": "Thêm email mới",
             "password": "Xác nhận bằng mật khẩu"
         },
-        "disable2FAAction": "Tắt xác minh hai bước",
         "changeFallbackEmail": {
             "title": "Đổi email khôi phục mật khẩu"
         },
diff --git a/dashboard/public/translation/zh_Hans.json b/dashboard/public/translation/zh_Hans.json
index e2c000765..a350f3226 100644
--- a/dashboard/public/translation/zh_Hans.json
+++ b/dashboard/public/translation/zh_Hans.json
@@ -37,8 +37,6 @@
             "copyNow": "请复制 API Token。出于安全考虑，这个 API Token 未来不会再显示。"
         },
         "changePasswordAction": "修改密码",
-        "disable2FAAction": "停用双因素验证",
-        "enable2FAAction": "启用双因素验证",
         "title": "个人资料",
         "primaryEmail": "主要 Email",
         "passwordRecoveryEmail": "密码恢复 Email",
diff --git a/dashboard/src/views/ProfileView.vue b/dashboard/src/views/ProfileView.vue
index 6df4cf2c8..49b123d65 100644
--- a/dashboard/src/views/ProfileView.vue
+++ b/dashboard/src/views/ProfileView.vue
@@ -231,24 +231,24 @@ onMounted(async () => {
           <SettingsItem v-if="!profile.source || !config.external2FA">
             <FormGroup>
               <label>{{ $t('profile.twoFactorAuth.totpTitle') }}</label>
-              <div v-if="profile.totpEnabled">{{ $t('profile.twoFactorAuth.totpEnabled') }} <i class="fa-solid fa-check text-success"></i></div>
-              <div v-else>{{ $t('profile.twoFactorAuth.disabled') }}</div>
+              <div v-if="profile.totpEnabled">{{ $t('profile.twoFactorAuth.totpEnabled') }}</i></div>
+              <div v-else>{{ $t('profile.notSet') }}</div>
             </FormGroup>
             <div style="display: flex; align-items: center">
-              <Button tool plain v-if="profile.totpEnabled" @click="onTwoFADisable('totp')">{{ $t('profile.disable2FAAction') }}</Button>
-              <Button tool plain v-else @click="onOpenTwoFASetupDialog('totp')">{{ $t('profile.enable2FAAction') }}</Button>
+              <Button tool plain v-if="profile.totpEnabled" @click="onTwoFADisable('totp')">{{ $t('main.action.disable') }}</Button>
+              <Button tool plain v-else @click="onOpenTwoFASetupDialog('totp')">{{ $t('main.action.setup') }}</Button>
             </div>
           </SettingsItem>
 
           <SettingsItem v-if="!profile.source || !config.external2FA">
             <FormGroup>
               <label>{{ $t('profile.twoFactorAuth.passkeyTitle') }}</label>
-              <div v-if="userPasskey">{{ $t('profile.twoFactorAuth.passkeyEnabled') }} <i class="fa-solid fa-check text-success"></i></div>
-              <div v-else>{{ $t('profile.twoFactorAuth.disabled') }}</div>
+              <div v-if="userPasskey">{{ $t('profile.twoFactorAuth.passkeyEnabled') }}</div>
+              <div v-else>{{ $t('profile.notSet') }}</div>
             </FormGroup>
             <div style="display: flex; align-items: center">
-              <Button tool plain v-if="userPasskey" @click="onTwoFADisable('passkey')">{{ $t('profile.disable2FAAction') }}</Button>
-              <Button tool plain v-else @click="onOpenTwoFASetupDialog('passkey')">{{ $t('profile.enable2FAAction') }}</Button>
+              <Button tool plain v-if="userPasskey" @click="onTwoFADisable('passkey')">{{ $t('main.action.disable') }}</Button>
+              <Button tool plain v-else @click="onOpenTwoFASetupDialog('passkey')">{{ $t('main.action.setup') }}</Button>
             </div>
           </SettingsItem>
         </div>