diff --git a/canaille/translations/messages.pot b/canaille/translations/messages.pot
index 36c28db7..4e547b3b 100644
--- a/canaille/translations/messages.pot
+++ b/canaille/translations/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-12-20 11:15+0100\n"
+"POT-Creation-Date: 2024-12-23 10:40+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,16 +49,11 @@ msgstr ""
 msgid "This password appears on public compromission databases and is not secure."
 msgstr ""
 
-#: canaille/app/forms.py:136 canaille/core/endpoints/forms.py:80
-#: canaille/core/endpoints/forms.py:219
-msgid "Password and confirmation do not match."
-msgstr ""
-
-#: canaille/app/forms.py:308
+#: canaille/app/forms.py:291
 msgid "The page number is not valid"
 msgstr ""
 
-#: canaille/app/forms.py:336
+#: canaille/app/forms.py:319
 msgid "Not a valid datetime value."
 msgstr ""
 
@@ -93,8 +88,8 @@ msgstr ""
 msgid "John Doe"
 msgstr ""
 
-#: canaille/backends/ldap/backend.py:179 canaille/core/endpoints/forms.py:105
-#: canaille/core/endpoints/forms.py:372
+#: canaille/backends/ldap/backend.py:179 canaille/core/endpoints/forms.py:110
+#: canaille/core/endpoints/forms.py:377
 msgid "jdoe"
 msgstr ""
 
@@ -178,36 +173,36 @@ msgid ""
 "user left."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:90 canaille/core/endpoints/account.py:116
+#: canaille/core/endpoints/account.py:92 canaille/core/endpoints/account.py:118
 msgid "You will receive soon an email to continue the registration process."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:123
+#: canaille/core/endpoints/account.py:125
 msgid ""
 "An error happened while sending your registration mail. Please try again "
 "in a few minutes. If this still happens, please contact the "
 "administrators."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:247
-#: canaille/core/endpoints/account.py:270
+#: canaille/core/endpoints/account.py:249
+#: canaille/core/endpoints/account.py:272
 msgid "The registration link that brought you here was invalid."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:254
+#: canaille/core/endpoints/account.py:256
 msgid "The registration link that brought you here has expired."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:263
+#: canaille/core/endpoints/account.py:265
 msgid "Your account has already been created."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:278
+#: canaille/core/endpoints/account.py:280
 msgid "You are already logged in, you cannot create an account."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:299 canaille/core/endpoints/forms.py:256
-#: canaille/core/endpoints/forms.py:390 canaille/templates/base.html:80
+#: canaille/core/endpoints/account.py:301 canaille/core/endpoints/forms.py:261
+#: canaille/core/endpoints/forms.py:395 canaille/templates/base.html:80
 #: canaille/templates/core/groups.html:10
 #: canaille/templates/core/groups.html:28
 #: canaille/templates/core/partial/group-members.html:15
@@ -215,124 +210,129 @@ msgstr ""
 msgid "Groups"
 msgstr ""
 
-#: canaille/core/endpoints/account.py:325
-#: canaille/core/endpoints/account.py:414
+#: canaille/core/endpoints/account.py:326 canaille/core/endpoints/forms.py:85
+#: canaille/core/endpoints/forms.py:224
+msgid "Password and confirmation do not match."
+msgstr ""
+
+#: canaille/core/endpoints/account.py:340
+#: canaille/core/endpoints/account.py:429
 msgid "User account creation failed."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:334
+#: canaille/core/endpoints/account.py:349
 msgid "Your account has been created successfully."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:349
-#: canaille/core/endpoints/account.py:371
+#: canaille/core/endpoints/account.py:364
+#: canaille/core/endpoints/account.py:386
 msgid "The email confirmation link that brought you here is invalid."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:356
+#: canaille/core/endpoints/account.py:371
 msgid "The email confirmation link that brought you here has expired."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:363
+#: canaille/core/endpoints/account.py:378
 msgid "The invitation link that brought you here was invalid."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:378
+#: canaille/core/endpoints/account.py:393
 msgid "This address email have already been confirmed."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:385
+#: canaille/core/endpoints/account.py:400
 msgid "This address email is already associated with another account."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:392
+#: canaille/core/endpoints/account.py:407
 msgid "Your email address have been confirmed."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:422
+#: canaille/core/endpoints/account.py:437
 msgid "User account creation succeed."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:598
-#: canaille/core/endpoints/account.py:786
+#: canaille/core/endpoints/account.py:613
+#: canaille/core/endpoints/account.py:801
 msgid "Profile edition failed."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:608
-#: canaille/core/endpoints/account.py:804
+#: canaille/core/endpoints/account.py:623
+#: canaille/core/endpoints/account.py:819
 msgid "Profile updated successfully."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:616
+#: canaille/core/endpoints/account.py:631
 msgid "Email addition failed."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:621
+#: canaille/core/endpoints/account.py:636
 msgid ""
 "An email has been sent to the email address. Please check your inbox and "
 "click on the verification link it contains"
 msgstr ""
 
-#: canaille/core/endpoints/account.py:628
+#: canaille/core/endpoints/account.py:643
 msgid "Could not send the verification email"
 msgstr ""
 
-#: canaille/core/endpoints/account.py:638
+#: canaille/core/endpoints/account.py:653
 msgid "Email deletion failed."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:641
+#: canaille/core/endpoints/account.py:656
 msgid "The email have been successfully deleted."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:680
+#: canaille/core/endpoints/account.py:695
 msgid ""
 "A password initialization link has been sent at the user email address. "
 "It should be received within a few minutes."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:687 canaille/core/endpoints/auth.py:184
+#: canaille/core/endpoints/account.py:702 canaille/core/endpoints/auth.py:183
 msgid "Could not send the password initialization email"
 msgstr ""
 
-#: canaille/core/endpoints/account.py:698
+#: canaille/core/endpoints/account.py:713
 msgid ""
 "A password reset link has been sent at the user email address. It should "
 "be received within a few minutes."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:705
+#: canaille/core/endpoints/account.py:720
 msgid "Could not send the password reset email"
 msgstr ""
 
-#: canaille/core/endpoints/account.py:721
+#: canaille/core/endpoints/account.py:736
 msgid "The account has been locked"
 msgstr ""
 
-#: canaille/core/endpoints/account.py:732
+#: canaille/core/endpoints/account.py:747
 msgid "The account has been unlocked"
 msgstr ""
 
-#: canaille/core/endpoints/account.py:745
+#: canaille/core/endpoints/account.py:760
 msgid "One-time password authentication has been reset"
 msgstr ""
 
-#: canaille/core/endpoints/account.py:824
+#: canaille/core/endpoints/account.py:839
 #, python-format
 msgid "The user %(user)s has been successfully deleted"
 msgstr ""
 
-#: canaille/core/endpoints/account.py:841
+#: canaille/core/endpoints/account.py:856
 msgid "Locked users cannot be impersonated."
 msgstr ""
 
-#: canaille/core/endpoints/account.py:845 canaille/core/endpoints/auth.py:135
-#: canaille/core/endpoints/auth.py:370
+#: canaille/core/endpoints/account.py:860 canaille/core/endpoints/auth.py:134
+#: canaille/core/endpoints/auth.py:367
 #, python-format
 msgid "Connection successful. Welcome %(user)s"
 msgstr ""
 
-#: canaille/core/endpoints/account.py:885 canaille/core/endpoints/auth.py:272
+#: canaille/core/endpoints/account.py:898 canaille/core/endpoints/auth.py:269
 msgid "Your password has been updated successfully"
 msgstr ""
 
@@ -342,9 +342,9 @@ msgid "Email"
 msgstr ""
 
 #: canaille/core/endpoints/admin.py:29 canaille/core/endpoints/forms.py:38
-#: canaille/core/endpoints/forms.py:61 canaille/core/endpoints/forms.py:150
-#: canaille/core/endpoints/forms.py:356 canaille/core/endpoints/forms.py:384
-#: canaille/core/endpoints/forms.py:408 canaille/core/endpoints/forms.py:424
+#: canaille/core/endpoints/forms.py:61 canaille/core/endpoints/forms.py:155
+#: canaille/core/endpoints/forms.py:361 canaille/core/endpoints/forms.py:389
+#: canaille/core/endpoints/forms.py:413 canaille/core/endpoints/forms.py:429
 msgid "jane.doe@example.com"
 msgstr ""
 
@@ -364,50 +364,50 @@ msgstr ""
 msgid "Email confirmation on {website_name}"
 msgstr ""
 
-#: canaille/core/endpoints/auth.py:65 canaille/core/endpoints/auth.py:97
-#: canaille/core/endpoints/auth.py:109
+#: canaille/core/endpoints/auth.py:64 canaille/core/endpoints/auth.py:96
+#: canaille/core/endpoints/auth.py:108
 msgid "Login failed, please check your information"
 msgstr ""
 
-#: canaille/core/endpoints/auth.py:80 canaille/core/endpoints/auth.py:294
-#: canaille/core/endpoints/auth.py:323 canaille/core/endpoints/auth.py:402
-#: canaille/core/endpoints/auth.py:442
+#: canaille/core/endpoints/auth.py:79 canaille/core/endpoints/auth.py:291
+#: canaille/core/endpoints/auth.py:320 canaille/core/endpoints/auth.py:399
+#: canaille/core/endpoints/auth.py:439
 msgid "Cannot remember the login you attempted to sign in with"
 msgstr ""
 
-#: canaille/core/endpoints/auth.py:152
+#: canaille/core/endpoints/auth.py:151
 #, python-format
 msgid "You have been disconnected. See you next time %(user)s"
 msgstr ""
 
-#: canaille/core/endpoints/auth.py:177
+#: canaille/core/endpoints/auth.py:176
 msgid ""
 "A password initialization link has been sent at your email address. You "
 "should receive it within a few minutes."
 msgstr ""
 
-#: canaille/core/endpoints/auth.py:200
+#: canaille/core/endpoints/auth.py:199
 msgid "Could not send the password reset link."
 msgstr ""
 
-#: canaille/core/endpoints/auth.py:204
+#: canaille/core/endpoints/auth.py:203
 msgid ""
 "A password reset link has been sent at your email address. You should "
 "receive it within a few minutes."
 msgstr ""
 
-#: canaille/core/endpoints/auth.py:216
+#: canaille/core/endpoints/auth.py:215
 #, python-format
 msgid ""
 "The user '%(user)s' does not have permissions to update their password. "
 "We cannot send a password reset email."
 msgstr ""
 
-#: canaille/core/endpoints/auth.py:238
+#: canaille/core/endpoints/auth.py:237
 msgid "We encountered an issue while we sent the password recovery email."
 msgstr ""
 
-#: canaille/core/endpoints/auth.py:261
+#: canaille/core/endpoints/auth.py:260
 msgid "The password reset link that brought you here was invalid."
 msgstr ""
 
@@ -418,25 +418,25 @@ msgid "Login"
 msgstr ""
 
 #: canaille/core/endpoints/forms.py:48 canaille/core/endpoints/forms.py:70
-#: canaille/core/endpoints/forms.py:204
+#: canaille/core/endpoints/forms.py:209
 #: canaille/templates/core/profile_settings.html:74
 msgid "Password"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:77 canaille/core/endpoints/forms.py:216
+#: canaille/core/endpoints/forms.py:82 canaille/core/endpoints/forms.py:221
 msgid "Password confirmation"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:99
+#: canaille/core/endpoints/forms.py:104
 msgid "Automatic"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:104
+#: canaille/core/endpoints/forms.py:109
 msgid "Username"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:108 canaille/core/endpoints/forms.py:310
-#: canaille/core/endpoints/forms.py:326 canaille/oidc/endpoints/forms.py:29
+#: canaille/core/endpoints/forms.py:113 canaille/core/endpoints/forms.py:315
+#: canaille/core/endpoints/forms.py:331 canaille/oidc/endpoints/forms.py:29
 #: canaille/templates/core/partial/group-members.html:12
 #: canaille/templates/core/partial/groups.html:6
 #: canaille/templates/core/partial/users.html:12
@@ -444,174 +444,174 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:110
+#: canaille/core/endpoints/forms.py:115
 msgid "Title"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:110
+#: canaille/core/endpoints/forms.py:115
 msgid "Vice president"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:113
+#: canaille/core/endpoints/forms.py:118
 msgid "Given name"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:115
+#: canaille/core/endpoints/forms.py:120
 msgid "John"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:121
+#: canaille/core/endpoints/forms.py:126
 msgid "Family Name"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:124
+#: canaille/core/endpoints/forms.py:129
 msgid "Doe"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:130
+#: canaille/core/endpoints/forms.py:135
 msgid "Display Name"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:133
+#: canaille/core/endpoints/forms.py:138
 msgid "Johnny"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:140 canaille/core/endpoints/forms.py:414
+#: canaille/core/endpoints/forms.py:145 canaille/core/endpoints/forms.py:419
 #: canaille/templates/core/profile_edit.html:188
 msgid "Email addresses"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:146 canaille/core/endpoints/forms.py:404
+#: canaille/core/endpoints/forms.py:151 canaille/core/endpoints/forms.py:409
 msgid ""
 "This email will be used as a recovery address to reset the password if "
 "needed"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:160
+#: canaille/core/endpoints/forms.py:165
 msgid "Phone numbers"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:161
+#: canaille/core/endpoints/forms.py:166
 msgid "555-000-555"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:168
+#: canaille/core/endpoints/forms.py:173
 msgid "Address"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:170
+#: canaille/core/endpoints/forms.py:175
 msgid "132, Foobar Street, Gotham City 12401, XX"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:174
+#: canaille/core/endpoints/forms.py:179
 msgid "Street"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:176
+#: canaille/core/endpoints/forms.py:181
 msgid "132, Foobar Street"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:180
+#: canaille/core/endpoints/forms.py:185
 msgid "Postal Code"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:186
+#: canaille/core/endpoints/forms.py:191
 msgid "Locality"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:188
+#: canaille/core/endpoints/forms.py:193
 msgid "Gotham City"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:192
+#: canaille/core/endpoints/forms.py:197
 msgid "Region"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:194
+#: canaille/core/endpoints/forms.py:199
 msgid "North Pole"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:198
+#: canaille/core/endpoints/forms.py:203
 msgid "Photo"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:202
+#: canaille/core/endpoints/forms.py:207
 #: canaille/templates/core/profile_add.html:64
 #: canaille/templates/core/profile_edit.html:76
 msgid "Delete the photo"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:227
+#: canaille/core/endpoints/forms.py:232
 msgid "User number"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:229 canaille/core/endpoints/forms.py:235
+#: canaille/core/endpoints/forms.py:234 canaille/core/endpoints/forms.py:240
 msgid "1234"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:233
+#: canaille/core/endpoints/forms.py:238
 msgid "Department"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:239
+#: canaille/core/endpoints/forms.py:244
 msgid "Organization"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:241
+#: canaille/core/endpoints/forms.py:246
 msgid "Cogip LTD."
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:245
+#: canaille/core/endpoints/forms.py:250
 msgid "Website"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:247
+#: canaille/core/endpoints/forms.py:252
 msgid "https://mywebsite.tld"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:252
+#: canaille/core/endpoints/forms.py:257
 msgid "Preferred language"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:262
+#: canaille/core/endpoints/forms.py:267
 msgid "users, admins …"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:287
+#: canaille/core/endpoints/forms.py:292
 msgid "Account expiration"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:313
+#: canaille/core/endpoints/forms.py:318
 msgid "group"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:317 canaille/core/endpoints/forms.py:336
+#: canaille/core/endpoints/forms.py:322 canaille/core/endpoints/forms.py:341
 #: canaille/templates/core/partial/groups.html:7
 msgid "Description"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:350 canaille/core/endpoints/forms.py:377
+#: canaille/core/endpoints/forms.py:355 canaille/core/endpoints/forms.py:382
 msgid "Email address"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:371
+#: canaille/core/endpoints/forms.py:376
 msgid "User name"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:375
+#: canaille/core/endpoints/forms.py:380
 msgid "Username editable by the invitee"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:417
+#: canaille/core/endpoints/forms.py:422
 msgid "New email address"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:433
+#: canaille/core/endpoints/forms.py:438
 #: canaille/templates/core/mails/email_otp.txt:5
 msgid "One-time password"
 msgstr ""
 
-#: canaille/core/endpoints/forms.py:439
+#: canaille/core/endpoints/forms.py:444
 msgid "123456"
 msgstr ""
 
@@ -778,11 +778,11 @@ msgstr ""
 msgid "Pre-consent"
 msgstr ""
 
-#: canaille/oidc/endpoints/oauth.py:379
+#: canaille/oidc/endpoints/oauth.py:388
 msgid "You have been disconnected"
 msgstr ""
 
-#: canaille/oidc/endpoints/oauth.py:396
+#: canaille/oidc/endpoints/oauth.py:405
 msgid "You have not been disconnected"
 msgstr ""
 
@@ -1102,13 +1102,13 @@ msgstr ""
 
 #: canaille/templates/core/login.html:52
 #: canaille/templates/core/mails/registration.txt:5
-#: canaille/templates/core/setup-2fa.html:64
+#: canaille/templates/core/setup-mfa.html:64
 msgid "Continue"
 msgstr ""
 
 #: canaille/templates/core/password.html:21
-#: canaille/templates/core/setup-2fa.html:32
-#: canaille/templates/core/verify-2fa.html:32
+#: canaille/templates/core/setup-mfa.html:32
+#: canaille/templates/core/verify-mfa.html:32
 #, python-format
 msgid "Sign in as %(username)s"
 msgstr ""
@@ -1118,7 +1118,7 @@ msgid "Please enter your password for this account."
 msgstr ""
 
 #: canaille/templates/core/password.html:39
-#: canaille/templates/core/verify-2fa.html:50
+#: canaille/templates/core/verify-mfa.html:50
 #, python-format
 msgid "I am not %(username)s"
 msgstr ""
@@ -1190,7 +1190,7 @@ msgid "Send a verification email to validate this address."
 msgstr ""
 
 #: canaille/templates/core/profile_edit.html:233
-#: canaille/templates/core/verify-2fa.html:51
+#: canaille/templates/core/verify-mfa.html:51
 msgid "Verify"
 msgstr ""
 
@@ -1295,11 +1295,11 @@ msgstr ""
 msgid "Impersonate"
 msgstr ""
 
-#: canaille/templates/core/setup-2fa.html:34
+#: canaille/templates/core/setup-mfa.html:34
 msgid "Set up multi-factor authentication."
 msgstr ""
 
-#: canaille/templates/core/verify-2fa.html:34
+#: canaille/templates/core/verify-mfa.html:34
 msgid "One-time password authentication."
 msgstr ""