diff --git a/modoboa/core/api/v2/serializers.py b/modoboa/core/api/v2/serializers.py
index aa40d674b..fe230139b 100644
--- a/modoboa/core/api/v2/serializers.py
+++ b/modoboa/core/api/v2/serializers.py
@@ -240,7 +240,7 @@ class CoreGlobalParametersSerializer(serializers.Serializer):
 
 class FIDOSerializer(serializers.ModelSerializer):
     class Meta:
-        model = models.UserFidoKeys
+        model = models.UserFidoKey
         fields = ["id", "name", "added_on", "last_used", "use_count"]
         extra_kwargs = {
             "id": {"read_only": True},
diff --git a/modoboa/core/api/v2/viewsets.py b/modoboa/core/api/v2/viewsets.py
index e616664b8..1e71ed15e 100644
--- a/modoboa/core/api/v2/viewsets.py
+++ b/modoboa/core/api/v2/viewsets.py
@@ -172,7 +172,7 @@ class FIDOViewSet(
 
     def get_queryset(self):
         if self.request.user.webauthn_enabled:
-            return models.UserFidoKeys.objects.filter(user=self.request.user)
+            return models.UserFidoKey.objects.filter(user=self.request.user)
         return None
 
     def destroy(self, request, *args, **kwargs):
@@ -201,7 +201,7 @@ class FIDOViewSet(
         serializer = serializers.FidoRegistrationSerializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         credential_data = f2_auth.end_registration(request)
-        models.UserFidoKeys.objects.create(
+        models.UserFidoKey.objects.create(
             name=request.data["name"],
             credential_data=credential_data,
             user=request.user,
diff --git a/modoboa/core/fido2_auth.py b/modoboa/core/fido2_auth.py
index d86873e0f..d2964b175 100644
--- a/modoboa/core/fido2_auth.py
+++ b/modoboa/core/fido2_auth.py
@@ -10,7 +10,7 @@ import fido2.features
 
 from django.utils import timezone
 
-from modoboa.core.models import User, UserFidoKeys
+from modoboa.core.models import User, UserFidoKey
 
 
 def set_json_mapping():
@@ -28,7 +28,7 @@ def create_fido2_server(rp_id: str) -> Fido2Server:
 def get_creds_from_user(user_id: int) -> dict:
     return {
         key: AttestedCredentialData(websafe_decode(key.credential_data))
-        for key in UserFidoKeys.objects.filter(user=user_id)
+        for key in UserFidoKey.objects.filter(user=user_id)
     }
 
 
diff --git a/modoboa/core/forms.py b/modoboa/core/forms.py
index 4a162244d..fdc80c42c 100644
--- a/modoboa/core/forms.py
+++ b/modoboa/core/forms.py
@@ -9,7 +9,7 @@ from django.utils.translation import gettext as _, gettext_lazy
 
 import django_otp
 
-from modoboa.core.models import User, UserFidoKeys
+from modoboa.core.models import User, UserFidoKey
 from modoboa.lib.form_utils import UserKwargModelFormMixin
 from modoboa.parameters import tools as param_tools
 
@@ -115,7 +115,7 @@ class TwoFAChoiceForm(forms.Form):
 
     def __init__(self, *args, **kwargs):
         user = kwargs.pop("user")
-        fido_keys = UserFidoKeys.objects.filter(user=user)
+        fido_keys = UserFidoKey.objects.filter(user=user)
         if fido_keys.exists():
             self.fields["two_fa_choices.choices"].choices = [
                 ("TOTP", "TOTP or recovery codes"),
diff --git a/modoboa/core/migrations/0028_userfidokeys.py b/modoboa/core/migrations/0028_userfidokeys.py
index aae5f240e..f81208fb2 100644
--- a/modoboa/core/migrations/0028_userfidokeys.py
+++ b/modoboa/core/migrations/0028_userfidokeys.py
@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name="UserFidoKeys",
+            name="UserFidoKey",
             fields=[
                 (
                     "id",
diff --git a/modoboa/core/models.py b/modoboa/core/models.py
index 42041efe0..1f7a838f8 100644
--- a/modoboa/core/models.py
+++ b/modoboa/core/models.py
@@ -417,7 +417,7 @@ class User(AbstractUser):
 reversion.register(User)
 
 
-class UserFidoKeys(models.Model):
+class UserFidoKey(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     name = models.CharField(max_length=255)
     added_on = models.DateTimeField(auto_now_add=True)