diff --git a/aleksis/core/frontend/components/two_factor/TwoFactor.vue b/aleksis/core/frontend/components/two_factor/TwoFactor.vue
index 6cdf7331a1f912f3f430a4f0b2443ac61de834ec..b6c023a55ffa3d9cf467d88109b46d78cf630ab0 100644
--- a/aleksis/core/frontend/components/two_factor/TwoFactor.vue
+++ b/aleksis/core/frontend/components/two_factor/TwoFactor.vue
@@ -42,8 +42,8 @@
                 {{
                   $tc(
                     "accounts.two_factor.backup_codes_count",
-                    twoFactor.backupCodesCount,
-                    { counter: twoFactor.backupCodesCount }
+                    twoFactor.backupTokensCount,
+                    { counter: twoFactor.backupTokensCount }
                   )
                 }}
               </v-list-item-subtitle>
diff --git a/aleksis/core/frontend/components/two_factor/TwoFactorDevice.vue b/aleksis/core/frontend/components/two_factor/TwoFactorDevice.vue
index 5cd74e6ff5c03b8ad9699509cccebf32524120cc..7af3fbe6452262e305575b4f7c1852ae79e039c5 100644
--- a/aleksis/core/frontend/components/two_factor/TwoFactorDevice.vue
+++ b/aleksis/core/frontend/components/two_factor/TwoFactorDevice.vue
@@ -16,9 +16,9 @@
       </v-list-item-subtitle>
     </template>
     <template #action>
-      <v-btn icon color="red" v-if="!primary">
-        <v-icon>mdi-delete</v-icon>
-      </v-btn>
+      <!--      <v-btn icon color="red" v-if="!primary">-->
+      <!--        <v-icon>mdi-delete</v-icon>-->
+      <!--      </v-btn>-->
     </template>
   </two-factor-device-base>
 </template>
diff --git a/aleksis/core/frontend/components/two_factor/twoFactor.graphql b/aleksis/core/frontend/components/two_factor/twoFactor.graphql
index f91ba0c417e733868dfc0b884afb66484da218f5..431215ed1840f9ad06e61e1c8c63cf6fe0af35b7 100644
--- a/aleksis/core/frontend/components/two_factor/twoFactor.graphql
+++ b/aleksis/core/frontend/components/two_factor/twoFactor.graphql
@@ -1,6 +1,7 @@
 {
   twoFactor {
     activated
+    backupTokensCount
     defaultDevice {
       persistentId
       name