diff --git a/canaille/translations/de/LC_MESSAGES/messages.po b/canaille/translations/de/LC_MESSAGES/messages.po
index 565d96a2..426ae435 100644
--- a/canaille/translations/de/LC_MESSAGES/messages.po
+++ b/canaille/translations/de/LC_MESSAGES/messages.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: contact@yaal.coop\n"
-"POT-Creation-Date: 2023-03-29 23:00+0200\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2023-05-26 15:31+0200\n"
 "PO-Revision-Date: 2023-05-14 23:49+0000\n"
 "Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/canaille/canaille/"
@@ -20,22 +20,70 @@ msgstr ""
 "X-Generator: Weblate 4.18-dev\n"
 "Generated-By: Babel 2.12.1\n"
 
-#: canaille/account.py:105 canaille/account.py:130
-#: canaille/oidc/endpoints.py:84
+#: canaille/app/flask.py:65
+msgid "No SMTP server has been configured"
+msgstr ""
+
+#: canaille/app/forms.py:20
+msgid "This is not a valid URL"
+msgstr ""
+
+#: canaille/app/forms.py:83
+msgid "The page number is not valid"
+msgstr ""
+
+#: canaille/backends/ldap/backend.py:98
+msgid "Could not connect to the LDAP server '{uri}'"
+msgstr ""
+
+#: canaille/backends/ldap/backend.py:114
+msgid "LDAP authentication failed with user '{user}'"
+msgstr ""
+
+#: canaille/backends/ldap/backend.py:214
+msgid "John Doe"
+msgstr ""
+
+#: canaille/backends/ldap/backend.py:217 canaille/core/forms.py:124
+#: canaille/core/forms.py:340
+msgid "jdoe"
+msgstr ""
+
+#: canaille/backends/ldap/backend.py:220
+msgid "john@doe.com"
+msgstr ""
+
+#: canaille/backends/ldap/backend.py:222
+msgid " or "
+msgstr ""
+
+#: canaille/backends/ldap/models.py:121
+#, fuzzy
+#| msgid "Your account has already been created."
+msgid "Your account has been locked."
+msgstr "Ihr Konto wurde bereits erstellt."
+
+#: canaille/backends/ldap/models.py:126
+msgid "You should change your password."
+msgstr ""
+
+#: canaille/core/account.py:97 canaille/core/account.py:120
+#: canaille/core/account.py:128 canaille/oidc/endpoints.py:81
+#: canaille/oidc/endpoints.py:87
 msgid "Login failed, please check your information"
 msgstr "Anmeldung fehlgeschlagen, bitte überprüfen Sie Ihre Angaben"
 
-#: canaille/account.py:136 canaille/account.py:621
+#: canaille/core/account.py:136 canaille/core/account.py:667
 #, python-format
 msgid "Connection successful. Welcome %(user)s"
 msgstr "Verbindung erfolgreich. Willkommen %(user)s"
 
-#: canaille/account.py:149
+#: canaille/core/account.py:151
 #, python-format
 msgid "You have been disconnected. See you next time %(user)s"
 msgstr "Ihre Verbindung wurde unterbrochen. Bis zum nächsten Mal %(user)s"
 
-#: canaille/account.py:169
+#: canaille/core/account.py:175
 msgid ""
 "A password initialization link has been sent at your email address. You "
 "should receive it within a few minutes."
@@ -43,54 +91,54 @@ msgstr ""
 "Ein Link zur Initialisierung des Passworts wurde an Ihre E-Mail-Adresse "
 "gesendet. Sie sollten ihn innerhalb weniger Minuten erhalten."
 
-#: canaille/account.py:175 canaille/account.py:524
+#: canaille/core/account.py:181 canaille/core/account.py:537
 msgid "Could not send the password initialization email"
 msgstr "Die E-Mail zur Kennwortinitialisierung konnte nicht gesendet werden"
 
-#: canaille/account.py:267 canaille/account.py:295
+#: canaille/core/account.py:275 canaille/core/account.py:303
 msgid "The invitation link that brought you here was invalid."
 msgstr ""
 
-#: canaille/account.py:274
+#: canaille/core/account.py:282
 msgid "The invitation link that brought you here has expired."
 msgstr ""
 
-#: canaille/account.py:281
+#: canaille/core/account.py:289
 msgid "Your account has already been created."
 msgstr "Ihr Konto wurde bereits erstellt."
 
-#: canaille/account.py:288
+#: canaille/core/account.py:296
 msgid "You are already logged in, you cannot create an account."
 msgstr ""
 
-#: canaille/account.py:307 canaille/forms.py:289 canaille/forms.py:370
-#: canaille/templates/groups.html:5 canaille/templates/groups.html:25
-#: canaille/templates/partial/users.html:18
+#: canaille/core/account.py:319 canaille/core/forms.py:263
+#: canaille/core/forms.py:358 canaille/templates/groups.html:5
+#: canaille/templates/groups.html:25 canaille/templates/partial/users.html:18
 #: canaille/themes/default/base.html:61
 msgid "Groups"
 msgstr ""
 
-#: canaille/account.py:329 canaille/account.py:358
+#: canaille/core/account.py:341 canaille/core/account.py:372
 msgid "User account creation failed."
 msgstr ""
 
-#: canaille/account.py:334
+#: canaille/core/account.py:346
 msgid "Your account has been created successfuly."
 msgstr ""
 
-#: canaille/account.py:399
+#: canaille/core/account.py:412
 msgid "User account creation succeed."
 msgstr ""
 
-#: canaille/account.py:460 canaille/account.py:567
+#: canaille/core/account.py:472 canaille/core/account.py:602
 msgid "Profile edition failed."
 msgstr ""
 
-#: canaille/account.py:486 canaille/account.py:582
+#: canaille/core/account.py:495 canaille/core/account.py:624
 msgid "Profile updated successfuly."
 msgstr ""
 
-#: canaille/account.py:518
+#: canaille/core/account.py:531
 msgid ""
 "A password initialization link has been sent at the user email address. It "
 "should be received within a few minutes."
@@ -98,7 +146,7 @@ msgstr ""
 "Ein Link zur Initialisierung des Passworts wurde an die E-Mail-Adresse des "
 "Benutzers gesendet. Sie sollten ihn innerhalb weniger Minuten erhalten."
 
-#: canaille/account.py:531
+#: canaille/core/account.py:544
 msgid ""
 "A password reset link has been sent at the user email address. It should be "
 "received within a few minutes."
@@ -106,20 +154,30 @@ msgstr ""
 "Ein Link zum Zurücksetzen des Passworts wurde an die E-Mail-Adresse des "
 "Benutzers gesendet. Sie sollten ihn innerhalb weniger Minuten erhalten."
 
-#: canaille/account.py:537
+#: canaille/core/account.py:550
 msgid "Could not send the password reset email"
 msgstr "Die E-Mail zum Zurücksetzen des Passworts konnte nicht gesendet werden"
 
-#: canaille/account.py:602
+#: canaille/core/account.py:559
+#, fuzzy
+msgid "The account has been locked"
+msgstr "Der Kunde wurde bearbeitet."
+
+#: canaille/core/account.py:570
+#, fuzzy
+msgid "The account has been unlocked"
+msgstr "Der Kunde wurde bearbeitet."
+
+#: canaille/core/account.py:644
 #, python-format
 msgid "The user %(user)s has been sucessfuly deleted"
 msgstr ""
 
-#: canaille/account.py:636
+#: canaille/core/account.py:684
 msgid "Could not send the password reset link."
 msgstr ""
 
-#: canaille/account.py:640
+#: canaille/core/account.py:688
 msgid ""
 "A password reset link has been sent at your email address. You should "
 "receive it within a few minutes."
@@ -127,7 +185,7 @@ msgstr ""
 "Ein Link zum Zurücksetzen des Passworts wurde an Ihre E-Mail-Adresse "
 "gesendet. Sie sollten ihn innerhalb weniger Minuten erhalten."
 
-#: canaille/account.py:651
+#: canaille/core/account.py:699
 #, python-format
 msgid ""
 "The user '%(user)s' does not have permissions to update their password. We "
@@ -136,371 +194,342 @@ msgstr ""
 "Der Benutzer „%(user)s“ hat nicht die Berechtigung, sein Passwort zu "
 "aktualisieren. Wir können keine E-Mail zum Zurücksetzen des Passworts senden."
 
-#: canaille/account.py:666
+#: canaille/core/account.py:714
 msgid "We encountered an issue while we sent the password recovery email."
 msgstr ""
 "Beim Versand der E-Mail zur Wiederherstellung des Passworts ist ein Problem "
 "aufgetreten."
 
-#: canaille/account.py:685
+#: canaille/core/account.py:735
 msgid "The password reset link that brought you here was invalid."
 msgstr ""
 
-#: canaille/account.py:694
+#: canaille/core/account.py:744
 msgid "Your password has been updated successfuly"
 msgstr ""
 
-#: canaille/admin.py:23 canaille/templates/partial/users.html:15
+#: canaille/core/admin.py:23 canaille/templates/partial/users.html:15
 msgid "Email"
 msgstr "E-Mail"
 
-#: canaille/admin.py:29 canaille/forms.py:85 canaille/forms.py:109
-#: canaille/forms.py:197 canaille/forms.py:364
+#: canaille/core/admin.py:29 canaille/core/forms.py:56
+#: canaille/core/forms.py:80 canaille/core/forms.py:168
+#: canaille/core/forms.py:352
 msgid "jane@doe.com"
 msgstr ""
 
-#: canaille/admin.py:42
+#: canaille/core/admin.py:42
 msgid "The test invitation mail has been sent correctly"
 msgstr "Die Testeinladungs-E-Mail wurde korrekt versendet"
 
-#: canaille/admin.py:44
+#: canaille/core/admin.py:44
 msgid "The test invitation mail has not been sent correctly"
 msgstr "Die Testeinladungs-E-Mail wurde nicht korrekt gesendet"
 
-#: canaille/admin.py:89 canaille/mails.py:187
+#: canaille/core/admin.py:89 canaille/core/mails.py:92
 msgid "Password initialization on {website_name}"
 msgstr ""
 
-#: canaille/admin.py:131 canaille/mails.py:147
+#: canaille/core/admin.py:131 canaille/core/mails.py:52
 msgid "Password reset on {website_name}"
 msgstr ""
 
-#: canaille/admin.py:173
+#: canaille/core/admin.py:173
 msgid "Invitation on {website_name}"
 msgstr ""
 
-#: canaille/apputils.py:32
-msgid "John Doe"
-msgstr ""
-
-#: canaille/apputils.py:35 canaille/forms.py:153 canaille/forms.py:352
-msgid "jdoe"
-msgstr ""
-
-#: canaille/apputils.py:38
-msgid "john@doe.com"
-msgstr ""
-
-#: canaille/apputils.py:40
-msgid " or "
-msgstr ""
-
-#: canaille/flaskutils.py:63
-msgid "No SMTP server has been configured"
-msgstr ""
-
-#: canaille/forms.py:19
-msgid "This is not a valid URL"
-msgstr ""
-
-#: canaille/forms.py:27
+#: canaille/core/forms.py:22
 msgid "The login '{login}' already exists"
 msgstr ""
 
-#: canaille/forms.py:36
+#: canaille/core/forms.py:31
 #, fuzzy
 #| msgid "The email '{email}' already exists"
 msgid "The email '{email}' is already used"
 msgstr "Die E-Mail '{email}' existiert bereits"
 
-#: canaille/forms.py:43
+#: canaille/core/forms.py:38
 msgid "The group '{group}' already exists"
 msgstr ""
 
-#: canaille/forms.py:52
+#: canaille/core/forms.py:47
 msgid "The login '{login}' does not exist"
 msgstr ""
 
-#: canaille/forms.py:77
-msgid "The page number is not valid"
-msgstr ""
-
-#: canaille/forms.py:82 canaille/forms.py:106
+#: canaille/core/forms.py:53 canaille/core/forms.py:77
 #: canaille/templates/partial/users.html:9
 msgid "Login"
 msgstr ""
 
-#: canaille/forms.py:95 canaille/forms.py:118 canaille/forms.py:242
+#: canaille/core/forms.py:66 canaille/core/forms.py:89
+#: canaille/core/forms.py:213
 msgid "Password"
 msgstr ""
 
-#: canaille/forms.py:125 canaille/forms.py:249
+#: canaille/core/forms.py:96 canaille/core/forms.py:223
 msgid "Password confirmation"
 msgstr ""
 
-#: canaille/forms.py:128 canaille/forms.py:252
+#: canaille/core/forms.py:99 canaille/core/forms.py:226
 msgid "Password and confirmation do not match."
 msgstr "Passwort und Bestätigung stimmen nicht überein."
 
-#: canaille/forms.py:147
+#: canaille/core/forms.py:118
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: canaille/forms.py:152 canaille/forms.py:351
+#: canaille/core/forms.py:123 canaille/core/forms.py:339
 msgid "Username"
 msgstr "Anmeldename"
 
-#: canaille/forms.py:156 canaille/forms.py:323 canaille/forms.py:337
-#: canaille/oidc/forms.py:22 canaille/templates/partial/groups.html:6
+#: canaille/core/forms.py:127 canaille/core/forms.py:311
+#: canaille/core/forms.py:325 canaille/oidc/forms.py:22
+#: canaille/templates/partial/groups.html:6
 #: canaille/templates/partial/oidc/admin/client_list.html:6
 #: canaille/templates/partial/users.html:12
 msgid "Name"
 msgstr "Name"
 
-#: canaille/forms.py:158
+#: canaille/core/forms.py:129
 msgid "Title"
 msgstr ""
 
-#: canaille/forms.py:158
+#: canaille/core/forms.py:129
 msgid "Vice president"
 msgstr ""
 
-#: canaille/forms.py:161
+#: canaille/core/forms.py:132
 msgid "Given name"
 msgstr "Vorname"
 
-#: canaille/forms.py:163
+#: canaille/core/forms.py:134
 msgid "John"
 msgstr "Maria"
 
-#: canaille/forms.py:169
+#: canaille/core/forms.py:140
 msgid "Family Name"
 msgstr "Familienname"
 
-#: canaille/forms.py:172
+#: canaille/core/forms.py:143
 msgid "Doe"
 msgstr "Mustermann"
 
-#: canaille/forms.py:178
+#: canaille/core/forms.py:149
 msgid "Display Name"
 msgstr "Anzeigename"
 
-#: canaille/forms.py:181
+#: canaille/core/forms.py:152
 msgid "Johnny"
 msgstr "Maria"
 
-#: canaille/forms.py:187 canaille/forms.py:357
+#: canaille/core/forms.py:158 canaille/core/forms.py:345
 msgid "Email address"
 msgstr "E-Mail-Adresse"
 
-#: canaille/forms.py:193
+#: canaille/core/forms.py:164
 msgid ""
 "This email will be used as a recovery address to reset the password if needed"
 msgstr ""
 "Diese E-Mail wird als Wiederherstellungsadresse verwendet, um das Passwort "
 "bei Bedarf zurückzusetzen"
 
-#: canaille/forms.py:203
+#: canaille/core/forms.py:174
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: canaille/forms.py:203
+#: canaille/core/forms.py:174
 msgid "555-000-555"
 msgstr "00 00 00 00 00"
 
-#: canaille/forms.py:206
+#: canaille/core/forms.py:177
 msgid "Address"
 msgstr "Adresse"
 
-#: canaille/forms.py:208
+#: canaille/core/forms.py:179
 #, fuzzy
 msgid "132, Foobar Street, Gotham City 12401, XX"
 msgstr "Beispielstraße 132, 11111 Musterstadt"
 
-#: canaille/forms.py:212
+#: canaille/core/forms.py:183
 msgid "Street"
 msgstr ""
 
-#: canaille/forms.py:214
+#: canaille/core/forms.py:185
 #, fuzzy
 msgid "132, Foobar Street"
 msgstr "Beispielstraße 132, 11111 Musterstadt"
 
-#: canaille/forms.py:218
+#: canaille/core/forms.py:189
 msgid "Postal Code"
 msgstr ""
 
-#: canaille/forms.py:224
+#: canaille/core/forms.py:195
 msgid "Locality"
 msgstr ""
 
-#: canaille/forms.py:226
+#: canaille/core/forms.py:197
 msgid "Gotham City"
 msgstr ""
 
-#: canaille/forms.py:230
+#: canaille/core/forms.py:201
 msgid "Region"
 msgstr ""
 
-#: canaille/forms.py:232
+#: canaille/core/forms.py:203
 msgid "North Pole"
 msgstr ""
 
-#: canaille/forms.py:236
+#: canaille/core/forms.py:207
 msgid "Photo"
 msgstr "Foto"
 
-#: canaille/forms.py:240 canaille/templates/profile_add.html:63
+#: canaille/core/forms.py:211 canaille/templates/profile_add.html:109
 #: canaille/templates/profile_edit.html:81
 msgid "Delete the photo"
 msgstr "Foto löschen"
 
-#: canaille/forms.py:260
+#: canaille/core/forms.py:234
 #, fuzzy
 #| msgid "Username"
 msgid "User number"
 msgstr "Anmeldename"
 
-#: canaille/forms.py:262 canaille/forms.py:268
+#: canaille/core/forms.py:236 canaille/core/forms.py:242
 msgid "1234"
 msgstr "1234"
 
-#: canaille/forms.py:266
+#: canaille/core/forms.py:240
 #, fuzzy
-msgid "Department number"
+msgid "Department"
 msgstr "Telefonnummer"
 
-#: canaille/forms.py:272
+#: canaille/core/forms.py:246
 msgid "Organization"
 msgstr ""
 
-#: canaille/forms.py:274
+#: canaille/core/forms.py:248
 msgid "Cogip LTD."
 msgstr ""
 
-#: canaille/forms.py:278
+#: canaille/core/forms.py:252
 msgid "Website"
 msgstr "Website"
 
-#: canaille/forms.py:280
+#: canaille/core/forms.py:254
 msgid "https://mywebsite.tld"
 msgstr "https://meinewebsite.de"
 
-#: canaille/forms.py:285
+#: canaille/core/forms.py:259
 msgid "Preferred language"
 msgstr "Bevorzugte Sprache"
 
-#: canaille/forms.py:291
+#: canaille/core/forms.py:267
 #, fuzzy
 msgid "users, admins …"
 msgstr "Benutzer/innen, Administrator/innen …"
 
-#: canaille/forms.py:326
+#: canaille/core/forms.py:289
+msgid "Account expiration"
+msgstr ""
+
+#: canaille/core/forms.py:314
 msgid "group"
 msgstr "Gruppe"
 
-#: canaille/forms.py:330 canaille/forms.py:344
+#: canaille/core/forms.py:318 canaille/core/forms.py:332
 #: canaille/templates/partial/groups.html:7
 msgid "Description"
 msgstr "Beschreibung"
 
-#: canaille/forms.py:355
+#: canaille/core/forms.py:343
 msgid "Username editable by the invitee"
 msgstr "Vom Eingeladenen bearbeitbarer Benutzername"
 
-#: canaille/groups.py:38
+#: canaille/core/groups.py:37
 msgid "Group creation failed."
 msgstr "Gruppenerstellung fehlgeschlagen."
 
-#: canaille/groups.py:46
+#: canaille/core/groups.py:45
 #, python-format
 msgid "The group %(group)s has been sucessfully created"
 msgstr ""
 
-#: canaille/groups.py:98
+#: canaille/core/groups.py:97
 #, python-format
 msgid "The group %(group)s has been sucessfully edited."
 msgstr ""
 
-#: canaille/groups.py:106
+#: canaille/core/groups.py:105
 msgid "Group edition failed."
 msgstr ""
 
-#: canaille/groups.py:120
+#: canaille/core/groups.py:119
 #, python-format
 msgid "The group %(group)s has been sucessfully deleted"
 msgstr ""
 
-#: canaille/mails.py:109
+#: canaille/core/mails.py:14
 msgid "Test email from {website_name}"
 msgstr "Test-E-Mail von {website_name}"
 
-#: canaille/mails.py:217
+#: canaille/core/mails.py:122
 msgid "You have been invited to create an account on {website_name}"
 msgstr "Sie wurden eingeladen, ein Konto auf {website_name} zu erstellen"
 
-#: canaille/ldap_backend/backend.py:61
-msgid "Could not connect to the LDAP server '{uri}'"
-msgstr ""
-
-#: canaille/ldap_backend/backend.py:77
-msgid "LDAP authentication failed with user '{user}'"
-msgstr ""
-
-#: canaille/oidc/clients.py:46
+#: canaille/oidc/clients.py:47
 msgid "The client has not been added. Please check your information."
 msgstr ""
 
-#: canaille/oidc/clients.py:82
+#: canaille/oidc/clients.py:83
 msgid "The client has been created."
 msgstr ""
 
-#: canaille/oidc/clients.py:126
+#: canaille/oidc/clients.py:131
 msgid "The client has not been edited. Please check your information."
 msgstr ""
 
-#: canaille/oidc/clients.py:155
+#: canaille/oidc/clients.py:160
 msgid "The client has been edited."
 msgstr "Der Kunde wurde bearbeitet."
 
-#: canaille/oidc/clients.py:168
+#: canaille/oidc/clients.py:173
 msgid "The client has been deleted."
 msgstr ""
 
-#: canaille/oidc/consents.py:73 canaille/oidc/consents.py:112
+#: canaille/oidc/consents.py:74 canaille/oidc/consents.py:113
 msgid "Could not revoke this access"
 msgstr ""
 
-#: canaille/oidc/consents.py:76
+#: canaille/oidc/consents.py:77
 msgid "The access is already revoked"
 msgstr ""
 
-#: canaille/oidc/consents.py:80 canaille/oidc/consents.py:129
+#: canaille/oidc/consents.py:81 canaille/oidc/consents.py:130
 msgid "The access has been revoked"
 msgstr ""
 
-#: canaille/oidc/consents.py:91
+#: canaille/oidc/consents.py:92
 msgid "Could not restore this access"
 msgstr ""
 
-#: canaille/oidc/consents.py:94
+#: canaille/oidc/consents.py:95
 msgid "The access is not revoked"
 msgstr ""
 
-#: canaille/oidc/consents.py:101
+#: canaille/oidc/consents.py:102
 #, fuzzy
 msgid "The access has been restored"
 msgstr "Der Kunde wurde bearbeitet."
 
-#: canaille/oidc/endpoints.py:135
+#: canaille/oidc/endpoints.py:142
 msgid "You have been successfully logged out."
 msgstr ""
 
-#: canaille/oidc/endpoints.py:341
+#: canaille/oidc/endpoints.py:348
 msgid "You have been disconnected"
 msgstr "Ihre Verbindung wurde unterbrochen"
 
-#: canaille/oidc/endpoints.py:358
+#: canaille/oidc/endpoints.py:365
 msgid "You have not been disconnected"
 msgstr ""
 
@@ -572,7 +601,7 @@ msgstr ""
 msgid "Pre-consent"
 msgstr ""
 
-#: canaille/oidc/tokens.py:58
+#: canaille/oidc/tokens.py:56
 msgid "The token has successfully been revoked."
 msgstr ""
 
@@ -734,13 +763,16 @@ msgstr ""
 #: canaille/templates/group.html:44
 #: canaille/templates/oidc/admin/client_edit.html:47
 #: canaille/templates/oidc/admin/token_view.html:50
+#: canaille/templates/profile_add.html:64
 #: canaille/templates/profile_settings.html:60
+#: canaille/templates/profile_settings.html:82
 msgid "Cancel"
 msgstr ""
 
 #: canaille/templates/group.html:45
 #: canaille/templates/oidc/admin/client_edit.html:48
 #: canaille/templates/oidc/admin/token_view.html:51
+#: canaille/templates/profile_add.html:65
 #: canaille/templates/profile_settings.html:61
 msgid "Delete"
 msgstr ""
@@ -768,10 +800,10 @@ msgstr ""
 msgid "Create group"
 msgstr ""
 
-#: canaille/templates/group.html:90 canaille/templates/profile_add.html:210
+#: canaille/templates/group.html:90
+#: canaille/templates/oidc/admin/client_edit.html:98
 #: canaille/templates/profile_edit.html:181
-#: canaille/templates/profile_settings.html:151
-msgid "Submit"
+msgid "Edit"
 msgstr ""
 
 #: canaille/templates/group.html:102
@@ -885,167 +917,217 @@ msgstr ""
 msgid "Sign in"
 msgstr ""
 
-#: canaille/templates/profile_add.html:5 canaille/templates/profile_add.html:40
+#: canaille/templates/profile_add.html:5 canaille/templates/profile_add.html:74
 #: canaille/templates/profile_edit.html:6
 msgid "User creation"
 msgstr ""
 
-#: canaille/templates/profile_add.html:44
-msgid "Create a new user account"
-msgstr ""
-
-#: canaille/templates/profile_add.html:49
-#: canaille/templates/profile_edit.html:23
-#: canaille/templates/profile_settings.html:21
-msgid "Personal information"
-msgstr ""
-
-#: canaille/templates/profile_add.html:60
-#: canaille/templates/profile_add.html:71
-#: canaille/templates/profile_edit.html:78
-#: canaille/templates/profile_edit.html:89
-msgid "Click to upload a photo"
-msgstr ""
-
-#: canaille/templates/profile_add.html:161
-#: canaille/templates/profile_edit.html:27
-#: canaille/templates/profile_settings.html:25
-#: canaille/templates/profile_settings.html:69
-msgid "Account information"
-msgstr ""
-
-#: canaille/templates/profile_add.html:185
-msgid "User password is not mandatory"
-msgstr ""
-
-#: canaille/templates/profile_add.html:188
-msgid "The user password can be set:"
-msgstr ""
-
-#: canaille/templates/profile_add.html:190
-msgid "by filling this form;"
-msgstr ""
-
-#: canaille/templates/profile_add.html:191
-msgid ""
-"by sending the user a password initialization mail, after the account "
-"creation;"
-msgstr ""
-
-#: canaille/templates/profile_add.html:192
-#: canaille/templates/profile_settings.html:109
-msgid ""
-"or simply waiting for the user to sign-in a first time, and then receive a "
-"password initialization mail."
-msgstr ""
-
-#: canaille/templates/profile_add.html:197
-msgid ""
-"The user will not be able to authenticate unless the password is set, but "
-"they will be able to ask for a password initialization mail."
-msgstr ""
-
-#: canaille/templates/profile_add.html:199
-msgid "The user will not be able to authenticate unless the password is set."
-msgstr ""
-
-#: canaille/templates/profile_edit.html:8
-#: canaille/templates/profile_edit.html:52
-#: canaille/templates/profile_settings.html:6
-msgid "My profile"
-msgstr ""
-
-#: canaille/templates/profile_edit.html:10
-#: canaille/templates/profile_edit.html:54
-#: canaille/templates/profile_settings.html:8
-msgid "User profile edition"
-msgstr ""
-
+#: canaille/templates/profile_add.html:41
 #: canaille/templates/profile_edit.html:41
 #: canaille/templates/profile_settings.html:37
 msgid "This user cannot edit this field"
 msgstr ""
 
+#: canaille/templates/profile_add.html:43
 #: canaille/templates/profile_edit.html:43
 #: canaille/templates/profile_settings.html:39
 msgid "This user cannot see this field"
 msgstr ""
 
-#: canaille/templates/profile_edit.html:60
-msgid "Edit your personal information"
-msgstr ""
-
-#: canaille/templates/profile_edit.html:62
-msgid "Edit information about a user"
-msgstr ""
-
+#: canaille/templates/profile_add.html:52
 #: canaille/templates/profile_settings.html:48
 msgid "Account deletion"
 msgstr ""
 
+#: canaille/templates/profile_add.html:57
 #: canaille/templates/profile_settings.html:53
 msgid ""
 "Are you sure you want to delete this user? This action is unrevokable and "
 "all the data about this user will be removed."
 msgstr ""
 
+#: canaille/templates/profile_add.html:59
 #: canaille/templates/profile_settings.html:55
 msgid ""
 "Are you sure you want to delete your account? This action is unrevokable and "
 "all your data will be removed forever."
 msgstr ""
 
-#: canaille/templates/profile_settings.html:98
+#: canaille/templates/profile_add.html:76
+#: canaille/templates/profile_edit.html:8
+#: canaille/templates/profile_edit.html:52
+#: canaille/templates/profile_settings.html:6
+msgid "My profile"
+msgstr ""
+
+#: canaille/templates/profile_add.html:78
+#: canaille/templates/profile_edit.html:10
+#: canaille/templates/profile_edit.html:54
+#: canaille/templates/profile_settings.html:8
+msgid "User profile edition"
+msgstr ""
+
+#: canaille/templates/profile_add.html:84
+msgid "Create a new user account"
+msgstr ""
+
+#: canaille/templates/profile_add.html:86
+#: canaille/templates/profile_edit.html:60
+msgid "Edit your personal information"
+msgstr ""
+
+#: canaille/templates/profile_add.html:88
+#: canaille/templates/profile_edit.html:62
+msgid "Edit information about a user"
+msgstr ""
+
+#: canaille/templates/profile_add.html:94
+#: canaille/templates/profile_edit.html:23
+#: canaille/templates/profile_settings.html:21
+msgid "Personal information"
+msgstr ""
+
+#: canaille/templates/profile_add.html:106
+#: canaille/templates/profile_add.html:117
+#: canaille/templates/profile_edit.html:78
+#: canaille/templates/profile_edit.html:89
+msgid "Click to upload a photo"
+msgstr ""
+
+#: canaille/templates/profile_add.html:206
+#: canaille/templates/profile_edit.html:27
+#: canaille/templates/profile_settings.html:25
+#: canaille/templates/profile_settings.html:91
+msgid "Account information"
+msgstr ""
+
+#: canaille/templates/profile_add.html:230
+msgid "User password is not mandatory"
+msgstr ""
+
+#: canaille/templates/profile_add.html:233
+msgid "The user password can be set:"
+msgstr ""
+
+#: canaille/templates/profile_add.html:235
+msgid "by filling this form;"
+msgstr ""
+
+#: canaille/templates/profile_add.html:236
+msgid ""
+"by sending the user a password initialization mail, after the account "
+"creation;"
+msgstr ""
+
+#: canaille/templates/profile_add.html:237
+#: canaille/templates/profile_settings.html:135
+msgid ""
+"or simply waiting for the user to sign-in a first time, and then receive a "
+"password initialization mail."
+msgstr ""
+
+#: canaille/templates/profile_add.html:242
+msgid ""
+"The user will not be able to authenticate unless the password is set, but "
+"they will be able to ask for a password initialization mail."
+msgstr ""
+
+#: canaille/templates/profile_add.html:244
+msgid "The user will not be able to authenticate unless the password is set."
+msgstr ""
+
+#: canaille/templates/profile_add.html:255
+#: canaille/templates/profile_settings.html:199
+msgid "Submit"
+msgstr ""
+
+#: canaille/templates/profile_settings.html:70
+msgid "Account locking"
+msgstr ""
+
+#: canaille/templates/profile_settings.html:75
+msgid ""
+"Are you sure you want to lock this account? The user won't be able to login "
+"until their account is unlocked."
+msgstr ""
+
+#: canaille/templates/profile_settings.html:77
+msgid ""
+"Are you sure you want to lock your account? You won't be abel to login until "
+"your account is unlocked."
+msgstr ""
+
+#: canaille/templates/profile_settings.html:83
+msgid "Lock"
+msgstr ""
+
+#: canaille/templates/profile_settings.html:124
 msgid "Send email"
 msgstr ""
 
-#: canaille/templates/profile_settings.html:102
+#: canaille/templates/profile_settings.html:128
 msgid "This user does not have a password yet"
 msgstr ""
 
-#: canaille/templates/profile_settings.html:105
+#: canaille/templates/profile_settings.html:131
 msgid "You can solve this by:"
 msgstr ""
 
-#: canaille/templates/profile_settings.html:107
+#: canaille/templates/profile_settings.html:133
 msgid "setting a password using this form;"
 msgstr ""
 
-#: canaille/templates/profile_settings.html:108
+#: canaille/templates/profile_settings.html:134
 msgid ""
 "sending the user a password initialization mail, by clicking this button;"
 msgstr ""
 
-#: canaille/templates/profile_settings.html:112
+#: canaille/templates/profile_settings.html:138
 msgid "The user will not be able to authenticate unless the password is set"
 msgstr ""
 
-#: canaille/templates/profile_settings.html:120
+#: canaille/templates/profile_settings.html:146
 msgid "Send mail"
 msgstr ""
 
 #: canaille/templates/mail/admin.html:97
-#: canaille/templates/profile_settings.html:123
+#: canaille/templates/profile_settings.html:149
 #: canaille/templates/reset-password.html:11
 #: canaille/templates/reset-password.html:16
 msgid "Password reset"
 msgstr ""
 
-#: canaille/templates/profile_settings.html:125
+#: canaille/templates/profile_settings.html:151
 msgid ""
 "If the user has forgotten his password, you can send him a password reset "
 "email by clicking this button."
 msgstr ""
 
-#: canaille/templates/profile_settings.html:137
+#: canaille/templates/profile_settings.html:160
+msgid "Unlock"
+msgstr ""
+
+#: canaille/templates/profile_settings.html:163
+msgid "This user account is locked"
+msgstr ""
+
+#: canaille/templates/profile_settings.html:166
+msgid "The user won't be able to connect until their account is unlocked."
+msgstr ""
+
+#: canaille/templates/profile_settings.html:178
+msgid "Lock the account"
+msgstr ""
+
+#: canaille/templates/profile_settings.html:185
 msgid "Delete the user"
 msgstr ""
 
-#: canaille/templates/profile_settings.html:139
+#: canaille/templates/profile_settings.html:187
 msgid "Delete my account"
 msgstr ""
 
-#: canaille/templates/profile_settings.html:146
+#: canaille/templates/profile_settings.html:194
 msgid "Impersonate"
 msgstr ""
 
@@ -1054,14 +1136,14 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: canaille/templates/macro/form.html:67
+#: canaille/templates/macro/form.html:60
 #: canaille/templates/oidc/admin/client_edit.html:63
 #: canaille/templates/oidc/admin/client_edit.html:72
 #: canaille/templates/oidc/admin/client_edit.html:81
 msgid "This field is not editable"
 msgstr ""
 
-#: canaille/templates/macro/form.html:71
+#: canaille/templates/macro/form.html:64
 msgid "This field is required"
 msgstr ""
 
@@ -1084,7 +1166,7 @@ msgstr ""
 
 #: canaille/templates/mail/admin.html:5 canaille/templates/mail/admin.html:12
 #: canaille/templates/oidc/admin/authorization_list.html:16
-#: canaille/templates/oidc/admin/authorization_view.html:12
+#: canaille/templates/oidc/admin/authorization_view.html:11
 #: canaille/templates/oidc/admin/client_add.html:12
 #: canaille/templates/oidc/admin/client_edit.html:16
 #: canaille/templates/oidc/admin/client_list.html:16
@@ -1095,7 +1177,7 @@ msgstr ""
 
 #: canaille/templates/mail/admin.html:16
 #: canaille/templates/oidc/admin/authorization_list.html:20
-#: canaille/templates/oidc/admin/authorization_view.html:16
+#: canaille/templates/oidc/admin/authorization_view.html:15
 #: canaille/templates/oidc/admin/client_add.html:16
 #: canaille/templates/oidc/admin/client_edit.html:20
 #: canaille/templates/oidc/admin/client_list.html:5
@@ -1108,7 +1190,7 @@ msgstr ""
 
 #: canaille/templates/mail/admin.html:20
 #: canaille/templates/oidc/admin/authorization_list.html:24
-#: canaille/templates/oidc/admin/authorization_view.html:20
+#: canaille/templates/oidc/admin/authorization_view.html:19
 #: canaille/templates/oidc/admin/client_add.html:5
 #: canaille/templates/oidc/admin/client_add.html:20
 #: canaille/templates/oidc/admin/client_add.html:36
@@ -1121,7 +1203,7 @@ msgstr ""
 
 #: canaille/templates/mail/admin.html:24
 #: canaille/templates/oidc/admin/authorization_list.html:28
-#: canaille/templates/oidc/admin/authorization_view.html:24
+#: canaille/templates/oidc/admin/authorization_view.html:23
 #: canaille/templates/oidc/admin/client_add.html:24
 #: canaille/templates/oidc/admin/client_edit.html:28
 #: canaille/templates/oidc/admin/client_list.html:28
@@ -1136,7 +1218,7 @@ msgstr ""
 #: canaille/templates/oidc/admin/authorization_list.html:5
 #: canaille/templates/oidc/admin/authorization_list.html:32
 #: canaille/templates/oidc/admin/authorization_list.html:41
-#: canaille/templates/oidc/admin/authorization_view.html:28
+#: canaille/templates/oidc/admin/authorization_view.html:27
 #: canaille/templates/oidc/admin/client_add.html:28
 #: canaille/templates/oidc/admin/client_edit.html:32
 #: canaille/templates/oidc/admin/client_list.html:32
@@ -1254,13 +1336,13 @@ msgid ""
 "%(site_name)s."
 msgstr ""
 
-#: canaille/templates/oidc/admin/authorization_view.html:5
-#: canaille/templates/oidc/admin/authorization_view.html:36
+#: canaille/templates/oidc/admin/authorization_view.html:4
+#: canaille/templates/oidc/admin/authorization_view.html:35
 msgid "View an authorization"
 msgstr ""
 
 #: canaille/templates/oidc/admin/client_add.html:39
-msgid "Confirm"
+msgid "Create"
 msgstr ""
 
 #: canaille/templates/oidc/admin/client_edit.html:5
@@ -1294,10 +1376,6 @@ msgstr ""
 msgid "Delete the client"
 msgstr ""
 
-#: canaille/templates/oidc/admin/client_edit.html:98
-msgid "Edit"
-msgstr ""
-
 #: canaille/templates/oidc/admin/token_view.html:5
 #: canaille/templates/oidc/admin/token_view.html:57
 msgid "Token details"
@@ -1391,7 +1469,7 @@ msgstr ""
 
 #: canaille/templates/oidc/user/consent_list.html:20
 #: canaille/templates/oidc/user/preconsent_list.html:20
-#: canaille/templates/oidc/user/preconsent_list.html:31
+#: canaille/templates/oidc/user/preconsent_list.html:30
 msgid "Pre-authorized applications"
 msgstr ""
 
@@ -1412,17 +1490,17 @@ msgid "Had access to:"
 msgstr ""
 
 #: canaille/templates/oidc/user/consent_list.html:61
-#: canaille/templates/oidc/user/preconsent_list.html:51
+#: canaille/templates/oidc/user/preconsent_list.html:52
 msgid "Has access to:"
 msgstr ""
 
 #: canaille/templates/oidc/user/consent_list.html:84
-#: canaille/templates/oidc/user/preconsent_list.html:73
+#: canaille/templates/oidc/user/preconsent_list.html:74
 msgid "Policy"
 msgstr ""
 
 #: canaille/templates/oidc/user/consent_list.html:92
-#: canaille/templates/oidc/user/preconsent_list.html:81
+#: canaille/templates/oidc/user/preconsent_list.html:82
 msgid "Terms of service"
 msgstr ""
 
@@ -1431,7 +1509,7 @@ msgid "Restore access"
 msgstr ""
 
 #: canaille/templates/oidc/user/consent_list.html:104
-#: canaille/templates/oidc/user/preconsent_list.html:87
+#: canaille/templates/oidc/user/preconsent_list.html:88
 msgid "Revoke access"
 msgstr ""
 
@@ -1466,11 +1544,20 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: canaille/templates/oidc/user/preconsent_list.html:34
+#: canaille/templates/oidc/user/preconsent_list.html:33
 msgid ""
 "Those applications automatically have authorizations to access you data."
 msgstr ""
 
+#: canaille/templates/oidc/user/preconsent_list.html:97
+#: canaille/templates/partial/groups.html:36
+#: canaille/templates/partial/oidc/admin/authorization_list.html:36
+#: canaille/templates/partial/oidc/admin/client_list.html:40
+#: canaille/templates/partial/oidc/admin/token_list.html:44
+#: canaille/templates/partial/users.html:70
+msgid "There is nothing here"
+msgstr ""
+
 #: canaille/templates/partial/groups.html:8
 msgid "Number of members"
 msgstr ""
@@ -1479,7 +1566,7 @@ msgstr ""
 #: canaille/templates/partial/oidc/admin/authorization_list.html:31
 #: canaille/templates/partial/oidc/admin/client_list.html:35
 #: canaille/templates/partial/oidc/admin/token_list.html:39
-#: canaille/templates/partial/users.html:63
+#: canaille/templates/partial/users.html:65
 msgid "No item matches your request"
 msgstr ""
 
@@ -1487,16 +1574,12 @@ msgstr ""
 #: canaille/templates/partial/oidc/admin/authorization_list.html:33
 #: canaille/templates/partial/oidc/admin/client_list.html:37
 #: canaille/templates/partial/oidc/admin/token_list.html:41
-#: canaille/templates/partial/users.html:65
+#: canaille/templates/partial/users.html:67
 msgid "Maybe try with different criterias?"
 msgstr ""
 
-#: canaille/templates/partial/groups.html:36
-#: canaille/templates/partial/oidc/admin/authorization_list.html:36
-#: canaille/templates/partial/oidc/admin/client_list.html:40
-#: canaille/templates/partial/oidc/admin/token_list.html:44
-#: canaille/templates/partial/users.html:68
-msgid "There is nothing here"
+#: canaille/templates/partial/users.html:29
+msgid "This account is locked"
 msgstr ""
 
 #: canaille/templates/partial/oidc/admin/authorization_list.html:5
diff --git a/canaille/translations/es/LC_MESSAGES/messages.po b/canaille/translations/es/LC_MESSAGES/messages.po
index ed57fdaa..48f68ff1 100644
--- a/canaille/translations/es/LC_MESSAGES/messages.po
+++ b/canaille/translations/es/LC_MESSAGES/messages.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: contact@yaal.coop\n"
-"POT-Creation-Date: 2023-03-29 23:00+0200\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2023-05-26 15:31+0200\n"
 "PO-Revision-Date: 2023-03-31 13:40+0000\n"
 "Last-Translator: gallegonovato <fran-carro@hotmail.es>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/canaille/"
@@ -21,22 +21,70 @@ msgstr ""
 "X-Generator: Weblate 4.17-dev\n"
 "Generated-By: Babel 2.12.1\n"
 
-#: canaille/account.py:105 canaille/account.py:130
-#: canaille/oidc/endpoints.py:84
+#: canaille/app/flask.py:65
+msgid "No SMTP server has been configured"
+msgstr "No se ha configurado un servidor SMTP"
+
+#: canaille/app/forms.py:20
+msgid "This is not a valid URL"
+msgstr "No es una dirección URL válida"
+
+#: canaille/app/forms.py:83
+msgid "The page number is not valid"
+msgstr "El número de página no es válido"
+
+#: canaille/backends/ldap/backend.py:98
+msgid "Could not connect to the LDAP server '{uri}'"
+msgstr "No fue posible conectar al servidor LDAP '{uri}'"
+
+#: canaille/backends/ldap/backend.py:114
+msgid "LDAP authentication failed with user '{user}'"
+msgstr "Falló la autenticación LDAP con el usuario '{user}'"
+
+#: canaille/backends/ldap/backend.py:214
+msgid "John Doe"
+msgstr "John Doe"
+
+#: canaille/backends/ldap/backend.py:217 canaille/core/forms.py:124
+#: canaille/core/forms.py:340
+msgid "jdoe"
+msgstr "jdoe"
+
+#: canaille/backends/ldap/backend.py:220
+msgid "john@doe.com"
+msgstr "john@doe.com"
+
+#: canaille/backends/ldap/backend.py:222
+msgid " or "
+msgstr " o "
+
+#: canaille/backends/ldap/models.py:121
+#, fuzzy
+#| msgid "Your account has already been created."
+msgid "Your account has been locked."
+msgstr "Tu cuenta ya existe."
+
+#: canaille/backends/ldap/models.py:126
+msgid "You should change your password."
+msgstr ""
+
+#: canaille/core/account.py:97 canaille/core/account.py:120
+#: canaille/core/account.py:128 canaille/oidc/endpoints.py:81
+#: canaille/oidc/endpoints.py:87
 msgid "Login failed, please check your information"
 msgstr "Falló el inicio de sesión, comprueba tus credenciales"
 
-#: canaille/account.py:136 canaille/account.py:621
+#: canaille/core/account.py:136 canaille/core/account.py:667
 #, python-format
 msgid "Connection successful. Welcome %(user)s"
 msgstr "Acceso correcto. Bienvenido/a %(user)s"
 
-#: canaille/account.py:149
+#: canaille/core/account.py:151
 #, python-format
 msgid "You have been disconnected. See you next time %(user)s"
 msgstr "La sesión se ha cerrado. Hasta la próxima, %(user)s"
 
-#: canaille/account.py:169
+#: canaille/core/account.py:175
 msgid ""
 "A password initialization link has been sent at your email address. You "
 "should receive it within a few minutes."
@@ -44,54 +92,54 @@ msgstr ""
 "Se ha enviado un enlace de inicialización de la contraseña a tu correo "
 "electrónico. Deberías recibirlo en algunos minutos."
 
-#: canaille/account.py:175 canaille/account.py:524
+#: canaille/core/account.py:181 canaille/core/account.py:537
 msgid "Could not send the password initialization email"
 msgstr "No fue posible enviar el email de inicialización de contraseña"
 
-#: canaille/account.py:267 canaille/account.py:295
+#: canaille/core/account.py:275 canaille/core/account.py:303
 msgid "The invitation link that brought you here was invalid."
 msgstr "El enlace de invitación con el que has accedido no es válido."
 
-#: canaille/account.py:274
+#: canaille/core/account.py:282
 msgid "The invitation link that brought you here has expired."
 msgstr "El enlace de invitación con el que has accedido ha expirado."
 
-#: canaille/account.py:281
+#: canaille/core/account.py:289
 msgid "Your account has already been created."
 msgstr "Tu cuenta ya existe."
 
-#: canaille/account.py:288
+#: canaille/core/account.py:296
 msgid "You are already logged in, you cannot create an account."
 msgstr "Ya has iniciado sesión, no puedes crear una cuenta."
 
-#: canaille/account.py:307 canaille/forms.py:289 canaille/forms.py:370
-#: canaille/templates/groups.html:5 canaille/templates/groups.html:25
-#: canaille/templates/partial/users.html:18
+#: canaille/core/account.py:319 canaille/core/forms.py:263
+#: canaille/core/forms.py:358 canaille/templates/groups.html:5
+#: canaille/templates/groups.html:25 canaille/templates/partial/users.html:18
 #: canaille/themes/default/base.html:61
 msgid "Groups"
 msgstr "Grupos"
 
-#: canaille/account.py:329 canaille/account.py:358
+#: canaille/core/account.py:341 canaille/core/account.py:372
 msgid "User account creation failed."
 msgstr "Falló la creación de la cuenta de usuario."
 
-#: canaille/account.py:334
+#: canaille/core/account.py:346
 msgid "Your account has been created successfuly."
 msgstr "Tu cuenta se ha creado correctamente."
 
-#: canaille/account.py:399
+#: canaille/core/account.py:412
 msgid "User account creation succeed."
 msgstr "Cuenta creada correctamente."
 
-#: canaille/account.py:460 canaille/account.py:567
+#: canaille/core/account.py:472 canaille/core/account.py:602
 msgid "Profile edition failed."
 msgstr "Falló la actualización del perfil."
 
-#: canaille/account.py:486 canaille/account.py:582
+#: canaille/core/account.py:495 canaille/core/account.py:624
 msgid "Profile updated successfuly."
 msgstr "Perfil actualizado correctamente."
 
-#: canaille/account.py:518
+#: canaille/core/account.py:531
 msgid ""
 "A password initialization link has been sent at the user email address. It "
 "should be received within a few minutes."
@@ -99,7 +147,7 @@ msgstr ""
 "Un enlace de inicialización de la contraseña se ha enviado a la dirección de "
 "correo electrónico del usuario. Debería recibirlo en algunos minutos."
 
-#: canaille/account.py:531
+#: canaille/core/account.py:544
 msgid ""
 "A password reset link has been sent at the user email address. It should be "
 "received within a few minutes."
@@ -107,20 +155,32 @@ msgstr ""
 "Un enlace para restablecer la contraseña se ha enviado a la dirección de "
 "correo electrónico del usuario. Debería recibirlo en algunos minutos."
 
-#: canaille/account.py:537
+#: canaille/core/account.py:550
 msgid "Could not send the password reset email"
 msgstr "No fue posible enviar el email para restablecer de contraseña"
 
-#: canaille/account.py:602
+#: canaille/core/account.py:559
+#, fuzzy
+#| msgid "The access has been revoked"
+msgid "The account has been locked"
+msgstr "El acceso ha sido revocado"
+
+#: canaille/core/account.py:570
+#, fuzzy
+#| msgid "The access has been revoked"
+msgid "The account has been unlocked"
+msgstr "El acceso ha sido revocado"
+
+#: canaille/core/account.py:644
 #, python-format
 msgid "The user %(user)s has been sucessfuly deleted"
 msgstr "El usuario %(user)s ha sido eliminado correctamente"
 
-#: canaille/account.py:636
+#: canaille/core/account.py:684
 msgid "Could not send the password reset link."
 msgstr "No fue posible enviar el email para restablecer de contraseña."
 
-#: canaille/account.py:640
+#: canaille/core/account.py:688
 msgid ""
 "A password reset link has been sent at your email address. You should "
 "receive it within a few minutes."
@@ -128,7 +188,7 @@ msgstr ""
 "Se ha enviado un enlace para restablecer la contraseña a tu correo "
 "electrónico. Deberías recibirlo en algunos minutos."
 
-#: canaille/account.py:651
+#: canaille/core/account.py:699
 #, python-format
 msgid ""
 "The user '%(user)s' does not have permissions to update their password. We "
@@ -137,362 +197,337 @@ msgstr ""
 "El usuario '%(user)s' no tiene permiso para actualizar su contraseña. No es "
 "posible enviarle un email para que restablezca su contraseña."
 
-#: canaille/account.py:666
+#: canaille/core/account.py:714
 msgid "We encountered an issue while we sent the password recovery email."
 msgstr "Se produjo un problema enviando el email para recuperar la contraseña."
 
-#: canaille/account.py:685
+#: canaille/core/account.py:735
 msgid "The password reset link that brought you here was invalid."
 msgstr ""
 "El enlace para restablecer la contraseña con el que has accedido no es "
 "válido."
 
-#: canaille/account.py:694
+#: canaille/core/account.py:744
 msgid "Your password has been updated successfuly"
 msgstr "Tu contraseña se ha actualizado correctamente"
 
-#: canaille/admin.py:23 canaille/templates/partial/users.html:15
+#: canaille/core/admin.py:23 canaille/templates/partial/users.html:15
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: canaille/admin.py:29 canaille/forms.py:85 canaille/forms.py:109
-#: canaille/forms.py:197 canaille/forms.py:364
+#: canaille/core/admin.py:29 canaille/core/forms.py:56
+#: canaille/core/forms.py:80 canaille/core/forms.py:168
+#: canaille/core/forms.py:352
 msgid "jane@doe.com"
 msgstr "jane@doe.com"
 
-#: canaille/admin.py:42
+#: canaille/core/admin.py:42
 msgid "The test invitation mail has been sent correctly"
 msgstr "El email de invitación de prueba se envió correctamente"
 
-#: canaille/admin.py:44
+#: canaille/core/admin.py:44
 msgid "The test invitation mail has not been sent correctly"
 msgstr "No se pudo enviar el email de invitación de prueba"
 
-#: canaille/admin.py:89 canaille/mails.py:187
+#: canaille/core/admin.py:89 canaille/core/mails.py:92
 msgid "Password initialization on {website_name}"
 msgstr "Inicialización de la contraseña en {website_name}"
 
-#: canaille/admin.py:131 canaille/mails.py:147
+#: canaille/core/admin.py:131 canaille/core/mails.py:52
 msgid "Password reset on {website_name}"
 msgstr "Restablecer contraseña en {website_name}"
 
-#: canaille/admin.py:173
+#: canaille/core/admin.py:173
 msgid "Invitation on {website_name}"
 msgstr "Invitación a {website_name}"
 
-#: canaille/apputils.py:32
-msgid "John Doe"
-msgstr "John Doe"
-
-#: canaille/apputils.py:35 canaille/forms.py:153 canaille/forms.py:352
-msgid "jdoe"
-msgstr "jdoe"
-
-#: canaille/apputils.py:38
-msgid "john@doe.com"
-msgstr "john@doe.com"
-
-#: canaille/apputils.py:40
-msgid " or "
-msgstr " o "
-
-#: canaille/flaskutils.py:63
-msgid "No SMTP server has been configured"
-msgstr "No se ha configurado un servidor SMTP"
-
-#: canaille/forms.py:19
-msgid "This is not a valid URL"
-msgstr "No es una dirección URL válida"
-
-#: canaille/forms.py:27
+#: canaille/core/forms.py:22
 msgid "The login '{login}' already exists"
 msgstr "El usuario '{login}' ya existe"
 
-#: canaille/forms.py:36
+#: canaille/core/forms.py:31
 msgid "The email '{email}' is already used"
 msgstr "El correo electrónico '{email}' ya está en uso"
 
-#: canaille/forms.py:43
+#: canaille/core/forms.py:38
 msgid "The group '{group}' already exists"
 msgstr "El grupo '{group}' ya existe"
 
-#: canaille/forms.py:52
+#: canaille/core/forms.py:47
 msgid "The login '{login}' does not exist"
 msgstr "El usuario '{login}' no existe"
 
-#: canaille/forms.py:77
-msgid "The page number is not valid"
-msgstr "El número de página no es válido"
-
-#: canaille/forms.py:82 canaille/forms.py:106
+#: canaille/core/forms.py:53 canaille/core/forms.py:77
 #: canaille/templates/partial/users.html:9
 msgid "Login"
 msgstr "Usuario"
 
-#: canaille/forms.py:95 canaille/forms.py:118 canaille/forms.py:242
+#: canaille/core/forms.py:66 canaille/core/forms.py:89
+#: canaille/core/forms.py:213
 msgid "Password"
 msgstr "Contraseña"
 
-#: canaille/forms.py:125 canaille/forms.py:249
+#: canaille/core/forms.py:96 canaille/core/forms.py:223
 msgid "Password confirmation"
 msgstr "Repetir contraseña"
 
-#: canaille/forms.py:128 canaille/forms.py:252
+#: canaille/core/forms.py:99 canaille/core/forms.py:226
 msgid "Password and confirmation do not match."
 msgstr "Las dos contraseñas no coinciden."
 
-#: canaille/forms.py:147
+#: canaille/core/forms.py:118
 msgid "Automatic"
 msgstr "Automático"
 
-#: canaille/forms.py:152 canaille/forms.py:351
+#: canaille/core/forms.py:123 canaille/core/forms.py:339
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: canaille/forms.py:156 canaille/forms.py:323 canaille/forms.py:337
-#: canaille/oidc/forms.py:22 canaille/templates/partial/groups.html:6
+#: canaille/core/forms.py:127 canaille/core/forms.py:311
+#: canaille/core/forms.py:325 canaille/oidc/forms.py:22
+#: canaille/templates/partial/groups.html:6
 #: canaille/templates/partial/oidc/admin/client_list.html:6
 #: canaille/templates/partial/users.html:12
 msgid "Name"
 msgstr "Nombre"
 
-#: canaille/forms.py:158
+#: canaille/core/forms.py:129
 msgid "Title"
 msgstr "Título"
 
-#: canaille/forms.py:158
+#: canaille/core/forms.py:129
 msgid "Vice president"
 msgstr "Vicepresidente"
 
-#: canaille/forms.py:161
+#: canaille/core/forms.py:132
 msgid "Given name"
 msgstr "Nombre de pila"
 
-#: canaille/forms.py:163
+#: canaille/core/forms.py:134
 msgid "John"
 msgstr "John"
 
-#: canaille/forms.py:169
+#: canaille/core/forms.py:140
 msgid "Family Name"
 msgstr "Apellidos"
 
-#: canaille/forms.py:172
+#: canaille/core/forms.py:143
 msgid "Doe"
 msgstr "Doe"
 
-#: canaille/forms.py:178
+#: canaille/core/forms.py:149
 msgid "Display Name"
 msgstr "Nombre a mostrar"
 
-#: canaille/forms.py:181
+#: canaille/core/forms.py:152
 msgid "Johnny"
 msgstr "Johnny"
 
-#: canaille/forms.py:187 canaille/forms.py:357
+#: canaille/core/forms.py:158 canaille/core/forms.py:345
 msgid "Email address"
 msgstr "Correo electrónico"
 
-#: canaille/forms.py:193
+#: canaille/core/forms.py:164
 msgid ""
 "This email will be used as a recovery address to reset the password if needed"
 msgstr ""
 "El correo electrónico será usado como dirección para recuperar la contraseña "
 "si es necesario"
 
-#: canaille/forms.py:203
+#: canaille/core/forms.py:174
 msgid "Phone number"
 msgstr "Número de teléfono"
 
-#: canaille/forms.py:203
+#: canaille/core/forms.py:174
 msgid "555-000-555"
 msgstr "+34 999 111 222"
 
-#: canaille/forms.py:206
+#: canaille/core/forms.py:177
 msgid "Address"
 msgstr "Dirección"
 
-#: canaille/forms.py:208
+#: canaille/core/forms.py:179
 msgid "132, Foobar Street, Gotham City 12401, XX"
 msgstr "Calle Foobar, 132, Gotham City 12401, XX"
 
-#: canaille/forms.py:212
+#: canaille/core/forms.py:183
 msgid "Street"
 msgstr "Calle"
 
-#: canaille/forms.py:214
+#: canaille/core/forms.py:185
 msgid "132, Foobar Street"
 msgstr "Calle Foobar, 132"
 
-#: canaille/forms.py:218
+#: canaille/core/forms.py:189
 msgid "Postal Code"
 msgstr "Código Postal"
 
-#: canaille/forms.py:224
+#: canaille/core/forms.py:195
 msgid "Locality"
 msgstr "Localidad"
 
-#: canaille/forms.py:226
+#: canaille/core/forms.py:197
 msgid "Gotham City"
 msgstr "Ciudad de Gotham"
 
-#: canaille/forms.py:230
+#: canaille/core/forms.py:201
 msgid "Region"
 msgstr "Región"
 
-#: canaille/forms.py:232
+#: canaille/core/forms.py:203
 msgid "North Pole"
 msgstr "Polo Norte"
 
-#: canaille/forms.py:236
+#: canaille/core/forms.py:207
 msgid "Photo"
 msgstr "Foto"
 
-#: canaille/forms.py:240 canaille/templates/profile_add.html:63
+#: canaille/core/forms.py:211 canaille/templates/profile_add.html:109
 #: canaille/templates/profile_edit.html:81
 msgid "Delete the photo"
 msgstr "Eliminar foto"
 
-#: canaille/forms.py:260
+#: canaille/core/forms.py:234
 msgid "User number"
 msgstr "Número de usuario"
 
-#: canaille/forms.py:262 canaille/forms.py:268
+#: canaille/core/forms.py:236 canaille/core/forms.py:242
 msgid "1234"
 msgstr "1234"
 
-#: canaille/forms.py:266
-msgid "Department number"
+#: canaille/core/forms.py:240
+#, fuzzy
+#| msgid "Department number"
+msgid "Department"
 msgstr "Número del departamento"
 
-#: canaille/forms.py:272
+#: canaille/core/forms.py:246
 msgid "Organization"
 msgstr "Organización"
 
-#: canaille/forms.py:274
+#: canaille/core/forms.py:248
 msgid "Cogip LTD."
 msgstr "Cogip LTD."
 
-#: canaille/forms.py:278
+#: canaille/core/forms.py:252
 msgid "Website"
 msgstr "Sitio web"
 
-#: canaille/forms.py:280
+#: canaille/core/forms.py:254
 msgid "https://mywebsite.tld"
 msgstr "http://example.com"
 
-#: canaille/forms.py:285
+#: canaille/core/forms.py:259
 msgid "Preferred language"
 msgstr "Idioma preferido"
 
-#: canaille/forms.py:291
+#: canaille/core/forms.py:267
 msgid "users, admins …"
 msgstr "usuarios, administradores…"
 
-#: canaille/forms.py:326
+#: canaille/core/forms.py:289
+#, fuzzy
+#| msgid "Account creation"
+msgid "Account expiration"
+msgstr "Crear cuenta"
+
+#: canaille/core/forms.py:314
 msgid "group"
 msgstr "grupo"
 
-#: canaille/forms.py:330 canaille/forms.py:344
+#: canaille/core/forms.py:318 canaille/core/forms.py:332
 #: canaille/templates/partial/groups.html:7
 msgid "Description"
 msgstr "Descripción"
 
-#: canaille/forms.py:355
+#: canaille/core/forms.py:343
 msgid "Username editable by the invitee"
 msgstr "Nombre de usuario editable por el invitado"
 
-#: canaille/groups.py:38
+#: canaille/core/groups.py:37
 msgid "Group creation failed."
 msgstr "Falló la creación del grupo."
 
-#: canaille/groups.py:46
+#: canaille/core/groups.py:45
 #, python-format
 msgid "The group %(group)s has been sucessfully created"
 msgstr "El grupo %(group)s se ha creado correctamente"
 
-#: canaille/groups.py:98
+#: canaille/core/groups.py:97
 #, python-format
 msgid "The group %(group)s has been sucessfully edited."
 msgstr "El grupo %(group)s se ha actualizado correctamente."
 
-#: canaille/groups.py:106
+#: canaille/core/groups.py:105
 msgid "Group edition failed."
 msgstr "Falló la actualización del grupo."
 
-#: canaille/groups.py:120
+#: canaille/core/groups.py:119
 #, python-format
 msgid "The group %(group)s has been sucessfully deleted"
 msgstr "El grupo %(group)s se ha eliminado correctamente"
 
-#: canaille/mails.py:109
+#: canaille/core/mails.py:14
 msgid "Test email from {website_name}"
 msgstr "Email de prueba de {website_name}"
 
-#: canaille/mails.py:217
+#: canaille/core/mails.py:122
 msgid "You have been invited to create an account on {website_name}"
 msgstr "Has sido invitado a crear una cuenta en {website_name}"
 
-#: canaille/ldap_backend/backend.py:61
-msgid "Could not connect to the LDAP server '{uri}'"
-msgstr "No fue posible conectar al servidor LDAP '{uri}'"
-
-#: canaille/ldap_backend/backend.py:77
-msgid "LDAP authentication failed with user '{user}'"
-msgstr "Falló la autenticación LDAP con el usuario '{user}'"
-
-#: canaille/oidc/clients.py:46
+#: canaille/oidc/clients.py:47
 msgid "The client has not been added. Please check your information."
 msgstr "El cliente no ha sido añadido. Comprueba la información."
 
-#: canaille/oidc/clients.py:82
+#: canaille/oidc/clients.py:83
 msgid "The client has been created."
 msgstr "El cliente ha sido creado."
 
-#: canaille/oidc/clients.py:126
+#: canaille/oidc/clients.py:131
 msgid "The client has not been edited. Please check your information."
 msgstr "El cliente no ha sido actualizado. Comprueba la información."
 
-#: canaille/oidc/clients.py:155
+#: canaille/oidc/clients.py:160
 msgid "The client has been edited."
 msgstr "El cliente ha sido actualizado."
 
-#: canaille/oidc/clients.py:168
+#: canaille/oidc/clients.py:173
 msgid "The client has been deleted."
 msgstr "El cliente ha sido eliminado."
 
-#: canaille/oidc/consents.py:73 canaille/oidc/consents.py:112
+#: canaille/oidc/consents.py:74 canaille/oidc/consents.py:113
 msgid "Could not revoke this access"
 msgstr "No se pudo revocar este acceso"
 
-#: canaille/oidc/consents.py:76
+#: canaille/oidc/consents.py:77
 msgid "The access is already revoked"
 msgstr "El acceso ya está revocado"
 
-#: canaille/oidc/consents.py:80 canaille/oidc/consents.py:129
+#: canaille/oidc/consents.py:81 canaille/oidc/consents.py:130
 msgid "The access has been revoked"
 msgstr "El acceso ha sido revocado"
 
-#: canaille/oidc/consents.py:91
+#: canaille/oidc/consents.py:92
 msgid "Could not restore this access"
 msgstr "No se ha podido restablecer este acceso"
 
-#: canaille/oidc/consents.py:94
+#: canaille/oidc/consents.py:95
 msgid "The access is not revoked"
 msgstr "El acceso no está revocado"
 
-#: canaille/oidc/consents.py:101
+#: canaille/oidc/consents.py:102
 msgid "The access has been restored"
 msgstr "Se ha restablecido el acceso"
 
-#: canaille/oidc/endpoints.py:135
+#: canaille/oidc/endpoints.py:142
 msgid "You have been successfully logged out."
 msgstr "La sesión se ha cerrado correctamente."
 
-#: canaille/oidc/endpoints.py:341
+#: canaille/oidc/endpoints.py:348
 msgid "You have been disconnected"
 msgstr "Has sido desconectado"
 
-#: canaille/oidc/endpoints.py:358
+#: canaille/oidc/endpoints.py:365
 msgid "You have not been disconnected"
 msgstr "No has sido desconectado"
 
@@ -564,7 +599,7 @@ msgstr "URI de JKW"
 msgid "Pre-consent"
 msgstr "Preconsentimiento"
 
-#: canaille/oidc/tokens.py:58
+#: canaille/oidc/tokens.py:56
 msgid "The token has successfully been revoked."
 msgstr "El token ha sido revocado con éxito."
 
@@ -734,13 +769,16 @@ msgstr ""
 #: canaille/templates/group.html:44
 #: canaille/templates/oidc/admin/client_edit.html:47
 #: canaille/templates/oidc/admin/token_view.html:50
+#: canaille/templates/profile_add.html:64
 #: canaille/templates/profile_settings.html:60
+#: canaille/templates/profile_settings.html:82
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: canaille/templates/group.html:45
 #: canaille/templates/oidc/admin/client_edit.html:48
 #: canaille/templates/oidc/admin/token_view.html:51
+#: canaille/templates/profile_add.html:65
 #: canaille/templates/profile_settings.html:61
 msgid "Delete"
 msgstr "Eliminar"
@@ -771,11 +809,11 @@ msgstr "Eliminar grupo"
 msgid "Create group"
 msgstr "Crear grupo"
 
-#: canaille/templates/group.html:90 canaille/templates/profile_add.html:210
+#: canaille/templates/group.html:90
+#: canaille/templates/oidc/admin/client_edit.html:98
 #: canaille/templates/profile_edit.html:181
-#: canaille/templates/profile_settings.html:151
-msgid "Submit"
-msgstr "Enviar"
+msgid "Edit"
+msgstr "Editar"
 
 #: canaille/templates/group.html:102
 msgid "Group members"
@@ -898,112 +936,29 @@ msgstr "No soy %(username)s"
 msgid "Sign in"
 msgstr "Iniciar sesión"
 
-#: canaille/templates/profile_add.html:5 canaille/templates/profile_add.html:40
+#: canaille/templates/profile_add.html:5 canaille/templates/profile_add.html:74
 #: canaille/templates/profile_edit.html:6
 msgid "User creation"
 msgstr "Crear usuario"
 
-#: canaille/templates/profile_add.html:44
-msgid "Create a new user account"
-msgstr "Crear una nueva cuenta"
-
-#: canaille/templates/profile_add.html:49
-#: canaille/templates/profile_edit.html:23
-#: canaille/templates/profile_settings.html:21
-msgid "Personal information"
-msgstr "Información personal"
-
-#: canaille/templates/profile_add.html:60
-#: canaille/templates/profile_add.html:71
-#: canaille/templates/profile_edit.html:78
-#: canaille/templates/profile_edit.html:89
-msgid "Click to upload a photo"
-msgstr "Clic para subir foto"
-
-#: canaille/templates/profile_add.html:161
-#: canaille/templates/profile_edit.html:27
-#: canaille/templates/profile_settings.html:25
-#: canaille/templates/profile_settings.html:69
-msgid "Account information"
-msgstr "Información de la cuenta"
-
-#: canaille/templates/profile_add.html:185
-msgid "User password is not mandatory"
-msgstr "La contraseña no es obligatoria"
-
-#: canaille/templates/profile_add.html:188
-msgid "The user password can be set:"
-msgstr "La contraseña se puede establecer:"
-
-#: canaille/templates/profile_add.html:190
-msgid "by filling this form;"
-msgstr "rellenando este formulario;"
-
-#: canaille/templates/profile_add.html:191
-msgid ""
-"by sending the user a password initialization mail, after the account "
-"creation;"
-msgstr ""
-"enviando un email de inicialización de contraseña al usuario, tras crear la "
-"cuenta;"
-
-#: canaille/templates/profile_add.html:192
-#: canaille/templates/profile_settings.html:109
-msgid ""
-"or simply waiting for the user to sign-in a first time, and then receive a "
-"password initialization mail."
-msgstr ""
-"o simplemente esperando a que el usuario inicie sesión por primera vez y "
-"entonces recibirá un email de inicialización de contraseña."
-
-#: canaille/templates/profile_add.html:197
-msgid ""
-"The user will not be able to authenticate unless the password is set, but "
-"they will be able to ask for a password initialization mail."
-msgstr ""
-"El usuario no podrá iniciar sesión hasta que establezca su contraseña, pero "
-"podrá solicitar que se le envíe un correo electrónico de inicialización de "
-"contraseña."
-
-#: canaille/templates/profile_add.html:199
-msgid "The user will not be able to authenticate unless the password is set."
-msgstr ""
-"El usuario no podrá iniciar sesión a menos que se establezca una contraeña."
-
-#: canaille/templates/profile_edit.html:8
-#: canaille/templates/profile_edit.html:52
-#: canaille/templates/profile_settings.html:6
-msgid "My profile"
-msgstr "Mi perfil"
-
-#: canaille/templates/profile_edit.html:10
-#: canaille/templates/profile_edit.html:54
-#: canaille/templates/profile_settings.html:8
-msgid "User profile edition"
-msgstr "Editar perfil de usuario"
-
+#: canaille/templates/profile_add.html:41
 #: canaille/templates/profile_edit.html:41
 #: canaille/templates/profile_settings.html:37
 msgid "This user cannot edit this field"
 msgstr "Este usuario no puede editar este campo"
 
+#: canaille/templates/profile_add.html:43
 #: canaille/templates/profile_edit.html:43
 #: canaille/templates/profile_settings.html:39
 msgid "This user cannot see this field"
 msgstr "Este usuario no puede ver este campo"
 
-#: canaille/templates/profile_edit.html:60
-msgid "Edit your personal information"
-msgstr "Editar tu información personal"
-
-#: canaille/templates/profile_edit.html:62
-msgid "Edit information about a user"
-msgstr "Editar información de un usuario"
-
+#: canaille/templates/profile_add.html:52
 #: canaille/templates/profile_settings.html:48
 msgid "Account deletion"
 msgstr "Eliminar cuenta"
 
+#: canaille/templates/profile_add.html:57
 #: canaille/templates/profile_settings.html:53
 msgid ""
 "Are you sure you want to delete this user? This action is unrevokable and "
@@ -1012,6 +967,7 @@ msgstr ""
 "¿Seguro que quieres eliminar este usuario? Esta acción no se puede deshacer "
 "y todos los datos de este usuario serán eliminados."
 
+#: canaille/templates/profile_add.html:59
 #: canaille/templates/profile_settings.html:55
 msgid ""
 "Are you sure you want to delete your account? This action is unrevokable and "
@@ -1020,46 +976,174 @@ msgstr ""
 "¿Seguro que quieres eliminar tu cuenta? Esta acción no se puede deshacer y "
 "todos tus datos se eliminarán para siempre."
 
-#: canaille/templates/profile_settings.html:98
+#: canaille/templates/profile_add.html:76
+#: canaille/templates/profile_edit.html:8
+#: canaille/templates/profile_edit.html:52
+#: canaille/templates/profile_settings.html:6
+msgid "My profile"
+msgstr "Mi perfil"
+
+#: canaille/templates/profile_add.html:78
+#: canaille/templates/profile_edit.html:10
+#: canaille/templates/profile_edit.html:54
+#: canaille/templates/profile_settings.html:8
+msgid "User profile edition"
+msgstr "Editar perfil de usuario"
+
+#: canaille/templates/profile_add.html:84
+msgid "Create a new user account"
+msgstr "Crear una nueva cuenta"
+
+#: canaille/templates/profile_add.html:86
+#: canaille/templates/profile_edit.html:60
+msgid "Edit your personal information"
+msgstr "Editar tu información personal"
+
+#: canaille/templates/profile_add.html:88
+#: canaille/templates/profile_edit.html:62
+msgid "Edit information about a user"
+msgstr "Editar información de un usuario"
+
+#: canaille/templates/profile_add.html:94
+#: canaille/templates/profile_edit.html:23
+#: canaille/templates/profile_settings.html:21
+msgid "Personal information"
+msgstr "Información personal"
+
+#: canaille/templates/profile_add.html:106
+#: canaille/templates/profile_add.html:117
+#: canaille/templates/profile_edit.html:78
+#: canaille/templates/profile_edit.html:89
+msgid "Click to upload a photo"
+msgstr "Clic para subir foto"
+
+#: canaille/templates/profile_add.html:206
+#: canaille/templates/profile_edit.html:27
+#: canaille/templates/profile_settings.html:25
+#: canaille/templates/profile_settings.html:91
+msgid "Account information"
+msgstr "Información de la cuenta"
+
+#: canaille/templates/profile_add.html:230
+msgid "User password is not mandatory"
+msgstr "La contraseña no es obligatoria"
+
+#: canaille/templates/profile_add.html:233
+msgid "The user password can be set:"
+msgstr "La contraseña se puede establecer:"
+
+#: canaille/templates/profile_add.html:235
+msgid "by filling this form;"
+msgstr "rellenando este formulario;"
+
+#: canaille/templates/profile_add.html:236
+msgid ""
+"by sending the user a password initialization mail, after the account "
+"creation;"
+msgstr ""
+"enviando un email de inicialización de contraseña al usuario, tras crear la "
+"cuenta;"
+
+#: canaille/templates/profile_add.html:237
+#: canaille/templates/profile_settings.html:135
+msgid ""
+"or simply waiting for the user to sign-in a first time, and then receive a "
+"password initialization mail."
+msgstr ""
+"o simplemente esperando a que el usuario inicie sesión por primera vez y "
+"entonces recibirá un email de inicialización de contraseña."
+
+#: canaille/templates/profile_add.html:242
+msgid ""
+"The user will not be able to authenticate unless the password is set, but "
+"they will be able to ask for a password initialization mail."
+msgstr ""
+"El usuario no podrá iniciar sesión hasta que establezca su contraseña, pero "
+"podrá solicitar que se le envíe un correo electrónico de inicialización de "
+"contraseña."
+
+#: canaille/templates/profile_add.html:244
+msgid "The user will not be able to authenticate unless the password is set."
+msgstr ""
+"El usuario no podrá iniciar sesión a menos que se establezca una contraeña."
+
+#: canaille/templates/profile_add.html:255
+#: canaille/templates/profile_settings.html:199
+msgid "Submit"
+msgstr "Enviar"
+
+#: canaille/templates/profile_settings.html:70
+#, fuzzy
+#| msgid "Account deletion"
+msgid "Account locking"
+msgstr "Eliminar cuenta"
+
+#: canaille/templates/profile_settings.html:75
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to revoke this token? This action is unrevokable."
+msgid ""
+"Are you sure you want to lock this account? The user won't be able to login "
+"until their account is unlocked."
+msgstr ""
+"¿Está seguro de que desea revocar este token? Esta acción es irrevocable."
+
+#: canaille/templates/profile_settings.html:77
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to delete your account? This action is unrevokable "
+#| "and all your data will be removed forever."
+msgid ""
+"Are you sure you want to lock your account? You won't be abel to login until "
+"your account is unlocked."
+msgstr ""
+"¿Seguro que quieres eliminar tu cuenta? Esta acción no se puede deshacer y "
+"todos tus datos se eliminarán para siempre."
+
+#: canaille/templates/profile_settings.html:83
+msgid "Lock"
+msgstr ""
+
+#: canaille/templates/profile_settings.html:124
 msgid "Send email"
 msgstr "Enviar email"
 
-#: canaille/templates/profile_settings.html:102
+#: canaille/templates/profile_settings.html:128
 msgid "This user does not have a password yet"
 msgstr "El usuario todavía no tiene una contraseña"
 
-#: canaille/templates/profile_settings.html:105
+#: canaille/templates/profile_settings.html:131
 msgid "You can solve this by:"
 msgstr "Para solucionar esto:"
 
-#: canaille/templates/profile_settings.html:107
+#: canaille/templates/profile_settings.html:133
 msgid "setting a password using this form;"
 msgstr "establece una contraseña usando este formulario;"
 
-#: canaille/templates/profile_settings.html:108
+#: canaille/templates/profile_settings.html:134
 msgid ""
 "sending the user a password initialization mail, by clicking this button;"
 msgstr ""
 "envía un email de inicialización de contraseña al usuario pulsando en este "
 "botón;"
 
-#: canaille/templates/profile_settings.html:112
+#: canaille/templates/profile_settings.html:138
 msgid "The user will not be able to authenticate unless the password is set"
 msgstr ""
 "El usuario no podrá iniciar sesión a menos que se establezca una contraeña"
 
-#: canaille/templates/profile_settings.html:120
+#: canaille/templates/profile_settings.html:146
 msgid "Send mail"
 msgstr "Enviar email"
 
 #: canaille/templates/mail/admin.html:97
-#: canaille/templates/profile_settings.html:123
+#: canaille/templates/profile_settings.html:149
 #: canaille/templates/reset-password.html:11
 #: canaille/templates/reset-password.html:16
 msgid "Password reset"
 msgstr "Restablecer contraseña"
 
-#: canaille/templates/profile_settings.html:125
+#: canaille/templates/profile_settings.html:151
 msgid ""
 "If the user has forgotten his password, you can send him a password reset "
 "email by clicking this button."
@@ -1067,15 +1151,39 @@ msgstr ""
 "Si el usuario olvidó su contraseña, puedes enviarle un email para "
 "restablecerla pulsando en este botón."
 
-#: canaille/templates/profile_settings.html:137
+#: canaille/templates/profile_settings.html:160
+msgid "Unlock"
+msgstr ""
+
+#: canaille/templates/profile_settings.html:163
+#, fuzzy
+#| msgid "This user cannot see this field"
+msgid "This user account is locked"
+msgstr "Este usuario no puede ver este campo"
+
+#: canaille/templates/profile_settings.html:166
+#, fuzzy
+#| msgid ""
+#| "The user will not be able to authenticate unless the password is set."
+msgid "The user won't be able to connect until their account is unlocked."
+msgstr ""
+"El usuario no podrá iniciar sesión a menos que se establezca una contraeña."
+
+#: canaille/templates/profile_settings.html:178
+#, fuzzy
+#| msgid "Delete my account"
+msgid "Lock the account"
+msgstr "Eliminar mi cuenta"
+
+#: canaille/templates/profile_settings.html:185
 msgid "Delete the user"
 msgstr "Eliminar usuario"
 
-#: canaille/templates/profile_settings.html:139
+#: canaille/templates/profile_settings.html:187
 msgid "Delete my account"
 msgstr "Eliminar mi cuenta"
 
-#: canaille/templates/profile_settings.html:146
+#: canaille/templates/profile_settings.html:194
 msgid "Impersonate"
 msgstr "Suplantar"
 
@@ -1084,14 +1192,14 @@ msgstr "Suplantar"
 msgid "Users"
 msgstr "Usuarios"
 
-#: canaille/templates/macro/form.html:67
+#: canaille/templates/macro/form.html:60
 #: canaille/templates/oidc/admin/client_edit.html:63
 #: canaille/templates/oidc/admin/client_edit.html:72
 #: canaille/templates/oidc/admin/client_edit.html:81
 msgid "This field is not editable"
 msgstr "Este campo no es editable"
 
-#: canaille/templates/macro/form.html:71
+#: canaille/templates/macro/form.html:64
 msgid "This field is required"
 msgstr "Este campo es obligatorio"
 
@@ -1114,7 +1222,7 @@ msgstr "%(nb_items)s artículos"
 
 #: canaille/templates/mail/admin.html:5 canaille/templates/mail/admin.html:12
 #: canaille/templates/oidc/admin/authorization_list.html:16
-#: canaille/templates/oidc/admin/authorization_view.html:12
+#: canaille/templates/oidc/admin/authorization_view.html:11
 #: canaille/templates/oidc/admin/client_add.html:12
 #: canaille/templates/oidc/admin/client_edit.html:16
 #: canaille/templates/oidc/admin/client_list.html:16
@@ -1125,7 +1233,7 @@ msgstr "Correos electrónicos"
 
 #: canaille/templates/mail/admin.html:16
 #: canaille/templates/oidc/admin/authorization_list.html:20
-#: canaille/templates/oidc/admin/authorization_view.html:16
+#: canaille/templates/oidc/admin/authorization_view.html:15
 #: canaille/templates/oidc/admin/client_add.html:16
 #: canaille/templates/oidc/admin/client_edit.html:20
 #: canaille/templates/oidc/admin/client_list.html:5
@@ -1138,7 +1246,7 @@ msgstr "Clientes"
 
 #: canaille/templates/mail/admin.html:20
 #: canaille/templates/oidc/admin/authorization_list.html:24
-#: canaille/templates/oidc/admin/authorization_view.html:20
+#: canaille/templates/oidc/admin/authorization_view.html:19
 #: canaille/templates/oidc/admin/client_add.html:5
 #: canaille/templates/oidc/admin/client_add.html:20
 #: canaille/templates/oidc/admin/client_add.html:36
@@ -1151,7 +1259,7 @@ msgstr "Añadir un cliente"
 
 #: canaille/templates/mail/admin.html:24
 #: canaille/templates/oidc/admin/authorization_list.html:28
-#: canaille/templates/oidc/admin/authorization_view.html:24
+#: canaille/templates/oidc/admin/authorization_view.html:23
 #: canaille/templates/oidc/admin/client_add.html:24
 #: canaille/templates/oidc/admin/client_edit.html:28
 #: canaille/templates/oidc/admin/client_list.html:28
@@ -1166,7 +1274,7 @@ msgstr "Tokens"
 #: canaille/templates/oidc/admin/authorization_list.html:5
 #: canaille/templates/oidc/admin/authorization_list.html:32
 #: canaille/templates/oidc/admin/authorization_list.html:41
-#: canaille/templates/oidc/admin/authorization_view.html:28
+#: canaille/templates/oidc/admin/authorization_view.html:27
 #: canaille/templates/oidc/admin/client_add.html:28
 #: canaille/templates/oidc/admin/client_edit.html:32
 #: canaille/templates/oidc/admin/client_list.html:32
@@ -1306,14 +1414,16 @@ msgstr ""
 "Este correo electrónico es una prueba para comprobar que recibe "
 "comunicaciones de %(site_name)s."
 
-#: canaille/templates/oidc/admin/authorization_view.html:5
-#: canaille/templates/oidc/admin/authorization_view.html:36
+#: canaille/templates/oidc/admin/authorization_view.html:4
+#: canaille/templates/oidc/admin/authorization_view.html:35
 msgid "View an authorization"
 msgstr "Ver una autorización"
 
 #: canaille/templates/oidc/admin/client_add.html:39
-msgid "Confirm"
-msgstr "Confirmar"
+#, fuzzy
+#| msgid "Created"
+msgid "Create"
+msgstr "Creado"
 
 #: canaille/templates/oidc/admin/client_edit.html:5
 #: canaille/templates/oidc/admin/client_edit.html:54
@@ -1348,10 +1458,6 @@ msgstr "Emitido en"
 msgid "Delete the client"
 msgstr "Eliminar cliente"
 
-#: canaille/templates/oidc/admin/client_edit.html:98
-msgid "Edit"
-msgstr "Editar"
-
 #: canaille/templates/oidc/admin/token_view.html:5
 #: canaille/templates/oidc/admin/token_view.html:57
 msgid "Token details"
@@ -1446,7 +1552,7 @@ msgstr "Mis consentimientos"
 
 #: canaille/templates/oidc/user/consent_list.html:20
 #: canaille/templates/oidc/user/preconsent_list.html:20
-#: canaille/templates/oidc/user/preconsent_list.html:31
+#: canaille/templates/oidc/user/preconsent_list.html:30
 msgid "Pre-authorized applications"
 msgstr "Solicitudes previamente autorizadas"
 
@@ -1467,17 +1573,17 @@ msgid "Had access to:"
 msgstr "Tenía acceso a:"
 
 #: canaille/templates/oidc/user/consent_list.html:61
-#: canaille/templates/oidc/user/preconsent_list.html:51
+#: canaille/templates/oidc/user/preconsent_list.html:52
 msgid "Has access to:"
 msgstr "Tiene acceso a:"
 
 #: canaille/templates/oidc/user/consent_list.html:84
-#: canaille/templates/oidc/user/preconsent_list.html:73
+#: canaille/templates/oidc/user/preconsent_list.html:74
 msgid "Policy"
 msgstr "Política"
 
 #: canaille/templates/oidc/user/consent_list.html:92
-#: canaille/templates/oidc/user/preconsent_list.html:81
+#: canaille/templates/oidc/user/preconsent_list.html:82
 msgid "Terms of service"
 msgstr "Condiciones del servicio"
 
@@ -1486,7 +1592,7 @@ msgid "Restore access"
 msgstr "Restaurar el acceso"
 
 #: canaille/templates/oidc/user/consent_list.html:104
-#: canaille/templates/oidc/user/preconsent_list.html:87
+#: canaille/templates/oidc/user/preconsent_list.html:88
 msgid "Revoke access"
 msgstr "Revocar el acceso"
 
@@ -1521,13 +1627,22 @@ msgstr "Permanecer conectado"
 msgid "Logout"
 msgstr "Cerrar sesión"
 
-#: canaille/templates/oidc/user/preconsent_list.html:34
+#: canaille/templates/oidc/user/preconsent_list.html:33
 msgid ""
 "Those applications automatically have authorizations to access you data."
 msgstr ""
 "Esas aplicaciones tienen automáticamente autorizaciones para acceder a sus "
 "datos."
 
+#: canaille/templates/oidc/user/preconsent_list.html:97
+#: canaille/templates/partial/groups.html:36
+#: canaille/templates/partial/oidc/admin/authorization_list.html:36
+#: canaille/templates/partial/oidc/admin/client_list.html:40
+#: canaille/templates/partial/oidc/admin/token_list.html:44
+#: canaille/templates/partial/users.html:70
+msgid "There is nothing here"
+msgstr "No hay nada aquí"
+
 #: canaille/templates/partial/groups.html:8
 msgid "Number of members"
 msgstr "Número de miembros"
@@ -1536,7 +1651,7 @@ msgstr "Número de miembros"
 #: canaille/templates/partial/oidc/admin/authorization_list.html:31
 #: canaille/templates/partial/oidc/admin/client_list.html:35
 #: canaille/templates/partial/oidc/admin/token_list.html:39
-#: canaille/templates/partial/users.html:63
+#: canaille/templates/partial/users.html:65
 msgid "No item matches your request"
 msgstr "Ningún artículo corresponde a su solicitud"
 
@@ -1544,17 +1659,13 @@ msgstr "Ningún artículo corresponde a su solicitud"
 #: canaille/templates/partial/oidc/admin/authorization_list.html:33
 #: canaille/templates/partial/oidc/admin/client_list.html:37
 #: canaille/templates/partial/oidc/admin/token_list.html:41
-#: canaille/templates/partial/users.html:65
+#: canaille/templates/partial/users.html:67
 msgid "Maybe try with different criterias?"
 msgstr "¿Quizás probando con otros criterios?"
 
-#: canaille/templates/partial/groups.html:36
-#: canaille/templates/partial/oidc/admin/authorization_list.html:36
-#: canaille/templates/partial/oidc/admin/client_list.html:40
-#: canaille/templates/partial/oidc/admin/token_list.html:44
-#: canaille/templates/partial/users.html:68
-msgid "There is nothing here"
-msgstr "No hay nada aquí"
+#: canaille/templates/partial/users.html:29
+msgid "This account is locked"
+msgstr ""
 
 #: canaille/templates/partial/oidc/admin/authorization_list.html:5
 msgid "Code"
@@ -1590,6 +1701,9 @@ msgstr "Consentimientos"
 msgid "Admin"
 msgstr "Administrador"
 
+#~ msgid "Confirm"
+#~ msgstr "Confirmar"
+
 #~ msgid "Employee number"
 #~ msgstr "Número del trabajador"
 
diff --git a/canaille/translations/fr/LC_MESSAGES/messages.po b/canaille/translations/fr/LC_MESSAGES/messages.po
index 3680d749..3e82fa9e 100644
--- a/canaille/translations/fr/LC_MESSAGES/messages.po
+++ b/canaille/translations/fr/LC_MESSAGES/messages.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: contact@yaal.coop\n"
-"POT-Creation-Date: 2023-03-29 23:00+0200\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2023-05-26 15:31+0200\n"
 "PO-Revision-Date: 2023-04-28 17:52+0000\n"
 "Last-Translator: Éloi Rivard <eloi.rivard@nubla.fr>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/canaille/canaille/"
@@ -22,22 +22,73 @@ msgstr ""
 "X-Generator: Weblate 4.18-dev\n"
 "Generated-By: Babel 2.12.1\n"
 
-#: canaille/account.py:105 canaille/account.py:130
-#: canaille/oidc/endpoints.py:84
+#: canaille/app/flask.py:65
+msgid "No SMTP server has been configured"
+msgstr "Aucun serveur SMTP n'a été configuré"
+
+#: canaille/app/forms.py:20
+msgid "This is not a valid URL"
+msgstr "Cette URL n’est pas valide"
+
+#: canaille/app/forms.py:83
+msgid "The page number is not valid"
+msgstr "Le numéro de page est invalide"
+
+#: canaille/backends/ldap/backend.py:98
+msgid "Could not connect to the LDAP server '{uri}'"
+msgstr "Impossible de se connecter au serveur LDAP '{uri}'"
+
+#: canaille/backends/ldap/backend.py:114
+msgid "LDAP authentication failed with user '{user}'"
+msgstr ""
+"L'authentification au serveur LDAP a échoué pour l'utilisateur '{user}'"
+
+#: canaille/backends/ldap/backend.py:214
+msgid "John Doe"
+msgstr "Camille Dupont"
+
+#: canaille/backends/ldap/backend.py:217 canaille/core/forms.py:124
+#: canaille/core/forms.py:340
+msgid "jdoe"
+msgstr "cdupont"
+
+#: canaille/backends/ldap/backend.py:220
+msgid "john@doe.com"
+msgstr "camille@dupont.fr"
+
+#: canaille/backends/ldap/backend.py:222
+msgid " or "
+msgstr " ou "
+
+#: canaille/backends/ldap/models.py:121
+#, fuzzy
+#| msgid "Your account has already been created."
+msgid "Your account has been locked."
+msgstr "Votre compte a déjà été créé."
+
+#: canaille/backends/ldap/models.py:126
+#, fuzzy
+#| msgid "Could not reset your password"
+msgid "You should change your password."
+msgstr "Impossible de réinitialiser votre mot de passe"
+
+#: canaille/core/account.py:97 canaille/core/account.py:120
+#: canaille/core/account.py:128 canaille/oidc/endpoints.py:81
+#: canaille/oidc/endpoints.py:87
 msgid "Login failed, please check your information"
 msgstr "La connexion a échoué, veuillez vérifier vos informations"
 
-#: canaille/account.py:136 canaille/account.py:621
+#: canaille/core/account.py:136 canaille/core/account.py:667
 #, python-format
 msgid "Connection successful. Welcome %(user)s"
 msgstr "Connexion réussie. Bienvenue %(user)s"
 
-#: canaille/account.py:149
+#: canaille/core/account.py:151
 #, python-format
 msgid "You have been disconnected. See you next time %(user)s"
 msgstr "Vous avez été déconnecté·e. À bientôt %(user)s"
 
-#: canaille/account.py:169
+#: canaille/core/account.py:175
 msgid ""
 "A password initialization link has been sent at your email address. You "
 "should receive it within a few minutes."
@@ -45,54 +96,54 @@ msgstr ""
 "Un lien d'initialisation de votre mot de passe vous a été envoyé par "
 "courriel. Vous devriez le recevoir d'ici une quelques minutes."
 
-#: canaille/account.py:175 canaille/account.py:524
+#: canaille/core/account.py:181 canaille/core/account.py:537
 msgid "Could not send the password initialization email"
 msgstr "Impossible d'envoyer le courriel d'initialisation de mot de passe"
 
-#: canaille/account.py:267 canaille/account.py:295
+#: canaille/core/account.py:275 canaille/core/account.py:303
 msgid "The invitation link that brought you here was invalid."
 msgstr "Le lien d'invitation qui vous a amené ici est invalide."
 
-#: canaille/account.py:274
+#: canaille/core/account.py:282
 msgid "The invitation link that brought you here has expired."
 msgstr "Le lien d'invitation qui vous a amené ici a expiré."
 
-#: canaille/account.py:281
+#: canaille/core/account.py:289
 msgid "Your account has already been created."
 msgstr "Votre compte a déjà été créé."
 
-#: canaille/account.py:288
+#: canaille/core/account.py:296
 msgid "You are already logged in, you cannot create an account."
 msgstr "Vous êtes déjà connectés, vous ne pouvez pas créer de compte."
 
-#: canaille/account.py:307 canaille/forms.py:289 canaille/forms.py:370
-#: canaille/templates/groups.html:5 canaille/templates/groups.html:25
-#: canaille/templates/partial/users.html:18
+#: canaille/core/account.py:319 canaille/core/forms.py:263
+#: canaille/core/forms.py:358 canaille/templates/groups.html:5
+#: canaille/templates/groups.html:25 canaille/templates/partial/users.html:18
 #: canaille/themes/default/base.html:61
 msgid "Groups"
 msgstr "Groupes"
 
-#: canaille/account.py:329 canaille/account.py:358
+#: canaille/core/account.py:341 canaille/core/account.py:372
 msgid "User account creation failed."
 msgstr "La création du compte utilisateur a échoué."
 
-#: canaille/account.py:334
+#: canaille/core/account.py:346
 msgid "Your account has been created successfuly."
 msgstr "Votre compte utilisateur a été créé avec succès."
 
-#: canaille/account.py:399
+#: canaille/core/account.py:412
 msgid "User account creation succeed."
 msgstr "La création du compte utilisateur a réussi."
 
-#: canaille/account.py:460 canaille/account.py:567
+#: canaille/core/account.py:472 canaille/core/account.py:602
 msgid "Profile edition failed."
 msgstr "L'édition du profil a échoué."
 
-#: canaille/account.py:486 canaille/account.py:582
+#: canaille/core/account.py:495 canaille/core/account.py:624
 msgid "Profile updated successfuly."
 msgstr "Le profil a été mis à jour avec succès."
 
-#: canaille/account.py:518
+#: canaille/core/account.py:531
 msgid ""
 "A password initialization link has been sent at the user email address. It "
 "should be received within a few minutes."
@@ -100,7 +151,7 @@ msgstr ""
 "Un lien d'initialisation de mot de passe a été envoyé à l'utilisateur par "
 "courriel. Il devrait arriver d'ici une quelques minutes."
 
-#: canaille/account.py:531
+#: canaille/core/account.py:544
 msgid ""
 "A password reset link has been sent at the user email address. It should be "
 "received within a few minutes."
@@ -108,20 +159,32 @@ msgstr ""
 "Un lien de réinitialisation de mot de passe a été envoyé à l'utilisateur par "
 "courriel. Il devrait arriver d'ici quelques de minutes."
 
-#: canaille/account.py:537
+#: canaille/core/account.py:550
 msgid "Could not send the password reset email"
 msgstr "Impossible d'envoyer le lien de réinitialisation"
 
-#: canaille/account.py:602
+#: canaille/core/account.py:559
+#, fuzzy
+#| msgid "The access has been revoked"
+msgid "The account has been locked"
+msgstr "L'accès a été révoqué"
+
+#: canaille/core/account.py:570
+#, fuzzy
+#| msgid "The access has been revoked"
+msgid "The account has been unlocked"
+msgstr "L'accès a été révoqué"
+
+#: canaille/core/account.py:644
 #, python-format
 msgid "The user %(user)s has been sucessfuly deleted"
 msgstr "L'utilisateur %(user)s a bien été supprimé"
 
-#: canaille/account.py:636
+#: canaille/core/account.py:684
 msgid "Could not send the password reset link."
 msgstr "Impossible d'envoyer le lien de réinitialisation."
 
-#: canaille/account.py:640
+#: canaille/core/account.py:688
 msgid ""
 "A password reset link has been sent at your email address. You should "
 "receive it within a few minutes."
@@ -129,7 +192,7 @@ msgstr ""
 "Un lien de ré-initialisation de votre mot de passe vous a été envoyé par "
 "courriel. Vous devriez le recevoir d'ici quelques minutes."
 
-#: canaille/account.py:651
+#: canaille/core/account.py:699
 #, python-format
 msgid ""
 "The user '%(user)s' does not have permissions to update their password. We "
@@ -138,363 +201,337 @@ msgstr ""
 "L'utilisateur '%(user)s' n'a pas la permission d'éditer son mot de passe. "
 "Nous ne pouvons pas lui envoyer un courriel de réinitialisation."
 
-#: canaille/account.py:666
+#: canaille/core/account.py:714
 msgid "We encountered an issue while we sent the password recovery email."
 msgstr ""
 "Nous avons rencontré un problème lors de l'envoi du courriel de "
 "réinitialisation de mot de passe."
 
-#: canaille/account.py:685
+#: canaille/core/account.py:735
 msgid "The password reset link that brought you here was invalid."
 msgstr "Le lien de réinitialisation qui vous a amené ici est invalide."
 
-#: canaille/account.py:694
+#: canaille/core/account.py:744
 msgid "Your password has been updated successfuly"
 msgstr "Votre mot de passe a correctement été mis à jour"
 
-#: canaille/admin.py:23 canaille/templates/partial/users.html:15
+#: canaille/core/admin.py:23 canaille/templates/partial/users.html:15
 msgid "Email"
 msgstr "Courriel"
 
-#: canaille/admin.py:29 canaille/forms.py:85 canaille/forms.py:109
-#: canaille/forms.py:197 canaille/forms.py:364
+#: canaille/core/admin.py:29 canaille/core/forms.py:56
+#: canaille/core/forms.py:80 canaille/core/forms.py:168
+#: canaille/core/forms.py:352
 msgid "jane@doe.com"
 msgstr "camille@dupont.fr"
 
-#: canaille/admin.py:42
+#: canaille/core/admin.py:42
 msgid "The test invitation mail has been sent correctly"
 msgstr "L'invitation de test a été envoyée correctement"
 
-#: canaille/admin.py:44
+#: canaille/core/admin.py:44
 msgid "The test invitation mail has not been sent correctly"
 msgstr "L'invitation de test n’a pas été envoyée correctement"
 
-#: canaille/admin.py:89 canaille/mails.py:187
+#: canaille/core/admin.py:89 canaille/core/mails.py:92
 msgid "Password initialization on {website_name}"
 msgstr "Initialisation de votre mot de passe sur {website_name}"
 
-#: canaille/admin.py:131 canaille/mails.py:147
+#: canaille/core/admin.py:131 canaille/core/mails.py:52
 msgid "Password reset on {website_name}"
 msgstr "Réinitialisation du mot de passe sur {website_name}"
 
-#: canaille/admin.py:173
+#: canaille/core/admin.py:173
 msgid "Invitation on {website_name}"
 msgstr "Invitation sur {website_name}"
 
-#: canaille/apputils.py:32
-msgid "John Doe"
-msgstr "Camille Dupont"
-
-#: canaille/apputils.py:35 canaille/forms.py:153 canaille/forms.py:352
-msgid "jdoe"
-msgstr "cdupont"
-
-#: canaille/apputils.py:38
-msgid "john@doe.com"
-msgstr "camille@dupont.fr"
-
-#: canaille/apputils.py:40
-msgid " or "
-msgstr " ou "
-
-#: canaille/flaskutils.py:63
-msgid "No SMTP server has been configured"
-msgstr "Aucun serveur SMTP n'a été configuré"
-
-#: canaille/forms.py:19
-msgid "This is not a valid URL"
-msgstr "Cette URL n’est pas valide"
-
-#: canaille/forms.py:27
+#: canaille/core/forms.py:22
 msgid "The login '{login}' already exists"
 msgstr "L'identifiant '{login}' existe déjà"
 
-#: canaille/forms.py:36
+#: canaille/core/forms.py:31
 msgid "The email '{email}' is already used"
 msgstr "L’adresse '{email}' est déjà utilisée"
 
-#: canaille/forms.py:43
+#: canaille/core/forms.py:38
 msgid "The group '{group}' already exists"
 msgstr "Le group '{group}' existe déjà"
 
-#: canaille/forms.py:52
+#: canaille/core/forms.py:47
 msgid "The login '{login}' does not exist"
 msgstr "L'identifiant '{login}' n'existe pas"
 
-#: canaille/forms.py:77
-msgid "The page number is not valid"
-msgstr "Le numéro de page est invalide"
-
-#: canaille/forms.py:82 canaille/forms.py:106
+#: canaille/core/forms.py:53 canaille/core/forms.py:77
 #: canaille/templates/partial/users.html:9
 msgid "Login"
 msgstr "Identifiant"
 
-#: canaille/forms.py:95 canaille/forms.py:118 canaille/forms.py:242
+#: canaille/core/forms.py:66 canaille/core/forms.py:89
+#: canaille/core/forms.py:213
 msgid "Password"
 msgstr "Mot de passe"
 
-#: canaille/forms.py:125 canaille/forms.py:249
+#: canaille/core/forms.py:96 canaille/core/forms.py:223
 msgid "Password confirmation"
 msgstr "Confirmation du mot de passe"
 
-#: canaille/forms.py:128 canaille/forms.py:252
+#: canaille/core/forms.py:99 canaille/core/forms.py:226
 msgid "Password and confirmation do not match."
 msgstr "Le mot de passe et sa confirmation ne correspondent pas."
 
-#: canaille/forms.py:147
+#: canaille/core/forms.py:118
 msgid "Automatic"
 msgstr "Automatique"
 
-#: canaille/forms.py:152 canaille/forms.py:351
+#: canaille/core/forms.py:123 canaille/core/forms.py:339
 msgid "Username"
 msgstr "Identifiant"
 
-#: canaille/forms.py:156 canaille/forms.py:323 canaille/forms.py:337
-#: canaille/oidc/forms.py:22 canaille/templates/partial/groups.html:6
+#: canaille/core/forms.py:127 canaille/core/forms.py:311
+#: canaille/core/forms.py:325 canaille/oidc/forms.py:22
+#: canaille/templates/partial/groups.html:6
 #: canaille/templates/partial/oidc/admin/client_list.html:6
 #: canaille/templates/partial/users.html:12
 msgid "Name"
 msgstr "Nom"
 
-#: canaille/forms.py:158
+#: canaille/core/forms.py:129
 msgid "Title"
 msgstr "Titre"
 
-#: canaille/forms.py:158
+#: canaille/core/forms.py:129
 msgid "Vice president"
 msgstr "Vice-président"
 
-#: canaille/forms.py:161
+#: canaille/core/forms.py:132
 msgid "Given name"
 msgstr "Prénom"
 
-#: canaille/forms.py:163
+#: canaille/core/forms.py:134
 msgid "John"
 msgstr "Martin"
 
-#: canaille/forms.py:169
+#: canaille/core/forms.py:140
 msgid "Family Name"
 msgstr "Nom de famille"
 
-#: canaille/forms.py:172
+#: canaille/core/forms.py:143
 msgid "Doe"
 msgstr "Dupont"
 
-#: canaille/forms.py:178
+#: canaille/core/forms.py:149
 msgid "Display Name"
 msgstr "Nom d'affichage"
 
-#: canaille/forms.py:181
+#: canaille/core/forms.py:152
 msgid "Johnny"
 msgstr "Martin.D"
 
-#: canaille/forms.py:187 canaille/forms.py:357
+#: canaille/core/forms.py:158 canaille/core/forms.py:345
 msgid "Email address"
 msgstr "Courriel"
 
-#: canaille/forms.py:193
+#: canaille/core/forms.py:164
 msgid ""
 "This email will be used as a recovery address to reset the password if needed"
 msgstr ""
 "Cette adresse servira d'adresse électronique de récupération pour recevoir "
 "un courriel de réinitialisation de mot de passe en cas de besoin"
 
-#: canaille/forms.py:203
+#: canaille/core/forms.py:174
 msgid "Phone number"
 msgstr "Numéro de téléphone"
 
-#: canaille/forms.py:203
+#: canaille/core/forms.py:174
 msgid "555-000-555"
 msgstr "06 01 02 03 04"
 
-#: canaille/forms.py:206
+#: canaille/core/forms.py:177
 msgid "Address"
 msgstr "Adresse"
 
-#: canaille/forms.py:208
+#: canaille/core/forms.py:179
 msgid "132, Foobar Street, Gotham City 12401, XX"
 msgstr "132, rue du Lorem Ipsum - 99000 Gotham City - XX"
 
-#: canaille/forms.py:212
+#: canaille/core/forms.py:183
 msgid "Street"
 msgstr "Rue"
 
-#: canaille/forms.py:214
+#: canaille/core/forms.py:185
 msgid "132, Foobar Street"
 msgstr "132, rue du Lorem Ipsum"
 
-#: canaille/forms.py:218
+#: canaille/core/forms.py:189
 msgid "Postal Code"
 msgstr "Code postal"
 
-#: canaille/forms.py:224
+#: canaille/core/forms.py:195
 msgid "Locality"
 msgstr "Ville"
 
-#: canaille/forms.py:226
+#: canaille/core/forms.py:197
 msgid "Gotham City"
 msgstr "Gotham City"
 
-#: canaille/forms.py:230
+#: canaille/core/forms.py:201
 msgid "Region"
 msgstr "Région"
 
-#: canaille/forms.py:232
+#: canaille/core/forms.py:203
 msgid "North Pole"
 msgstr "Pôle nord"
 
-#: canaille/forms.py:236
+#: canaille/core/forms.py:207
 msgid "Photo"
 msgstr "Photo"
 
-#: canaille/forms.py:240 canaille/templates/profile_add.html:63
+#: canaille/core/forms.py:211 canaille/templates/profile_add.html:109
 #: canaille/templates/profile_edit.html:81
 msgid "Delete the photo"
 msgstr "Supprimer la photo"
 
-#: canaille/forms.py:260
+#: canaille/core/forms.py:234
 msgid "User number"
 msgstr "Numéro d’utilisateur"
 
-#: canaille/forms.py:262 canaille/forms.py:268
+#: canaille/core/forms.py:236 canaille/core/forms.py:242
 msgid "1234"
 msgstr "1234"
 
-#: canaille/forms.py:266
-msgid "Department number"
+#: canaille/core/forms.py:240
+#, fuzzy
+#| msgid "Department number"
+msgid "Department"
 msgstr "Numéro du service"
 
-#: canaille/forms.py:272
+#: canaille/core/forms.py:246
 msgid "Organization"
 msgstr "Organisation"
 
-#: canaille/forms.py:274
+#: canaille/core/forms.py:248
 msgid "Cogip LTD."
 msgstr "Cogip SARL."
 
-#: canaille/forms.py:278
+#: canaille/core/forms.py:252
 msgid "Website"
 msgstr "Site web"
 
-#: canaille/forms.py:280
+#: canaille/core/forms.py:254
 msgid "https://mywebsite.tld"
 msgstr "https://mon-site-internet.fr"
 
-#: canaille/forms.py:285
+#: canaille/core/forms.py:259
 msgid "Preferred language"
 msgstr "Langue préférée"
 
-#: canaille/forms.py:291
+#: canaille/core/forms.py:267
 msgid "users, admins …"
 msgstr "utilisateurs, administrateurs …"
 
-#: canaille/forms.py:326
+#: canaille/core/forms.py:289
+#, fuzzy
+#| msgid "Account creation"
+msgid "Account expiration"
+msgstr "Création de compte"
+
+#: canaille/core/forms.py:314
 msgid "group"
 msgstr "groupe"
 
-#: canaille/forms.py:330 canaille/forms.py:344
+#: canaille/core/forms.py:318 canaille/core/forms.py:332
 #: canaille/templates/partial/groups.html:7
 msgid "Description"
 msgstr "Description"
 
-#: canaille/forms.py:355
+#: canaille/core/forms.py:343
 msgid "Username editable by the invitee"
 msgstr "L'identifiant sera éditable par la personne invitée"
 
-#: canaille/groups.py:38
+#: canaille/core/groups.py:37
 msgid "Group creation failed."
 msgstr "La création du groupe a échoué."
 
-#: canaille/groups.py:46
+#: canaille/core/groups.py:45
 #, python-format
 msgid "The group %(group)s has been sucessfully created"
 msgstr "Le groupe %(group)s a bien été créé"
 
-#: canaille/groups.py:98
+#: canaille/core/groups.py:97
 #, python-format
 msgid "The group %(group)s has been sucessfully edited."
 msgstr "Le groupe %(group)s a bien été édité."
 
-#: canaille/groups.py:106
+#: canaille/core/groups.py:105
 msgid "Group edition failed."
 msgstr "L'édition du groupe a échoué."
 
-#: canaille/groups.py:120
+#: canaille/core/groups.py:119
 #, python-format
 msgid "The group %(group)s has been sucessfully deleted"
 msgstr "Le groupe %(group)s a bien été supprimé"
 
-#: canaille/mails.py:109
+#: canaille/core/mails.py:14
 msgid "Test email from {website_name}"
 msgstr "Courriel de test de {website_name}"
 
-#: canaille/mails.py:217
+#: canaille/core/mails.py:122
 msgid "You have been invited to create an account on {website_name}"
 msgstr "Vous êtes invités à vous créer un compte sur {website_name}"
 
-#: canaille/ldap_backend/backend.py:61
-msgid "Could not connect to the LDAP server '{uri}'"
-msgstr "Impossible de se connecter au serveur LDAP '{uri}'"
-
-#: canaille/ldap_backend/backend.py:77
-msgid "LDAP authentication failed with user '{user}'"
-msgstr ""
-"L'authentification au serveur LDAP a échoué pour l'utilisateur '{user}'"
-
-#: canaille/oidc/clients.py:46
+#: canaille/oidc/clients.py:47
 msgid "The client has not been added. Please check your information."
 msgstr "Le client n'a pas été ajouté. Veuillez vérifier vos informations."
 
-#: canaille/oidc/clients.py:82
+#: canaille/oidc/clients.py:83
 msgid "The client has been created."
 msgstr "Le client a été créé."
 
-#: canaille/oidc/clients.py:126
+#: canaille/oidc/clients.py:131
 msgid "The client has not been edited. Please check your information."
 msgstr "Le client n'a pas été édité. Veuillez vérifier vos informations."
 
-#: canaille/oidc/clients.py:155
+#: canaille/oidc/clients.py:160
 msgid "The client has been edited."
 msgstr "Le client a été édité."
 
-#: canaille/oidc/clients.py:168
+#: canaille/oidc/clients.py:173
 msgid "The client has been deleted."
 msgstr "Le client a été supprimé."
 
-#: canaille/oidc/consents.py:73 canaille/oidc/consents.py:112
+#: canaille/oidc/consents.py:74 canaille/oidc/consents.py:113
 msgid "Could not revoke this access"
 msgstr "Impossible de révoquer cet accès"
 
-#: canaille/oidc/consents.py:76
+#: canaille/oidc/consents.py:77
 msgid "The access is already revoked"
 msgstr "L'accès a déjà été révoqué"
 
-#: canaille/oidc/consents.py:80 canaille/oidc/consents.py:129
+#: canaille/oidc/consents.py:81 canaille/oidc/consents.py:130
 msgid "The access has been revoked"
 msgstr "L'accès a été révoqué"
 
-#: canaille/oidc/consents.py:91
+#: canaille/oidc/consents.py:92
 msgid "Could not restore this access"
 msgstr "Impossible de restaurer cet accès"
 
-#: canaille/oidc/consents.py:94
+#: canaille/oidc/consents.py:95
 msgid "The access is not revoked"
 msgstr "L'accès n’est pas révoqué"
 
-#: canaille/oidc/consents.py:101
+#: canaille/oidc/consents.py:102
 msgid "The access has been restored"
 msgstr "L'accès a été restauré"
 
-#: canaille/oidc/endpoints.py:135
+#: canaille/oidc/endpoints.py:142
 msgid "You have been successfully logged out."
 msgstr "Vous avez été déconnecté·e."
 
-#: canaille/oidc/endpoints.py:341
+#: canaille/oidc/endpoints.py:348
 msgid "You have been disconnected"
 msgstr "Vous avez été déconnecté·e"
 
-#: canaille/oidc/endpoints.py:358
+#: canaille/oidc/endpoints.py:365
 msgid "You have not been disconnected"
 msgstr "Vous n'avez pas été déconnecté"
 
@@ -566,7 +603,7 @@ msgstr "URI du JWK"
 msgid "Pre-consent"
 msgstr "Pré-autorisé"
 
-#: canaille/oidc/tokens.py:58
+#: canaille/oidc/tokens.py:56
 msgid "The token has successfully been revoked."
 msgstr "Le jeton a été révoqué avec succès."
 
@@ -736,13 +773,16 @@ msgstr ""
 #: canaille/templates/group.html:44
 #: canaille/templates/oidc/admin/client_edit.html:47
 #: canaille/templates/oidc/admin/token_view.html:50
+#: canaille/templates/profile_add.html:64
 #: canaille/templates/profile_settings.html:60
+#: canaille/templates/profile_settings.html:82
 msgid "Cancel"
 msgstr "Annuler"
 
 #: canaille/templates/group.html:45
 #: canaille/templates/oidc/admin/client_edit.html:48
 #: canaille/templates/oidc/admin/token_view.html:51
+#: canaille/templates/profile_add.html:65
 #: canaille/templates/profile_settings.html:61
 msgid "Delete"
 msgstr "Supprimer"
@@ -773,11 +813,11 @@ msgstr "Supprimer le groupe"
 msgid "Create group"
 msgstr "Créer le groupe"
 
-#: canaille/templates/group.html:90 canaille/templates/profile_add.html:210
+#: canaille/templates/group.html:90
+#: canaille/templates/oidc/admin/client_edit.html:98
 #: canaille/templates/profile_edit.html:181
-#: canaille/templates/profile_settings.html:151
-msgid "Submit"
-msgstr "Valider"
+msgid "Edit"
+msgstr "Modifier"
 
 #: canaille/templates/group.html:102
 msgid "Group members"
@@ -901,113 +941,29 @@ msgstr "Je ne suis pas %(username)s"
 msgid "Sign in"
 msgstr "Se connecter"
 
-#: canaille/templates/profile_add.html:5 canaille/templates/profile_add.html:40
+#: canaille/templates/profile_add.html:5 canaille/templates/profile_add.html:74
 #: canaille/templates/profile_edit.html:6
 msgid "User creation"
 msgstr "Nouvel utilisateur"
 
-#: canaille/templates/profile_add.html:44
-msgid "Create a new user account"
-msgstr "Création d'un nouveau compte utilisateur"
-
-#: canaille/templates/profile_add.html:49
-#: canaille/templates/profile_edit.html:23
-#: canaille/templates/profile_settings.html:21
-msgid "Personal information"
-msgstr "Informations personnelles"
-
-#: canaille/templates/profile_add.html:60
-#: canaille/templates/profile_add.html:71
-#: canaille/templates/profile_edit.html:78
-#: canaille/templates/profile_edit.html:89
-msgid "Click to upload a photo"
-msgstr "Cliquez pour mettre en ligne une photo"
-
-#: canaille/templates/profile_add.html:161
-#: canaille/templates/profile_edit.html:27
-#: canaille/templates/profile_settings.html:25
-#: canaille/templates/profile_settings.html:69
-msgid "Account information"
-msgstr "Informations sur le compte"
-
-#: canaille/templates/profile_add.html:185
-msgid "User password is not mandatory"
-msgstr "Le mot de passe utilisateur n'est pas requis à la création"
-
-#: canaille/templates/profile_add.html:188
-msgid "The user password can be set:"
-msgstr "Il pourra être renseigné :"
-
-#: canaille/templates/profile_add.html:190
-msgid "by filling this form;"
-msgstr "en remplissant ce formulaire ;"
-
-#: canaille/templates/profile_add.html:191
-msgid ""
-"by sending the user a password initialization mail, after the account "
-"creation;"
-msgstr ""
-"en envoyant un lien d'initialisation de mot de passe, par courriel à "
-"l'utilisateur, après la création de son compte ;"
-
-#: canaille/templates/profile_add.html:192
-#: canaille/templates/profile_settings.html:109
-msgid ""
-"or simply waiting for the user to sign-in a first time, and then receive a "
-"password initialization mail."
-msgstr ""
-"ou simplement en attendant la première connexion de l'utilisateur, afin "
-"qu'il reçoive un lien d'initialisation de mot de passe par courriel."
-
-#: canaille/templates/profile_add.html:197
-msgid ""
-"The user will not be able to authenticate unless the password is set, but "
-"they will be able to ask for a password initialization mail."
-msgstr ""
-"Le nouvel utilisateur ne pourra pas se connecter tant que son mot de passe "
-"n'est pas défini, mais sera en mesure de demander l'envoi d'un email "
-"d'initialisation de mot de passe."
-
-#: canaille/templates/profile_add.html:199
-msgid "The user will not be able to authenticate unless the password is set."
-msgstr ""
-"L'utilisateur ne pourra pas se connecter tant que son mot de passe n'est pas "
-"défini."
-
-#: canaille/templates/profile_edit.html:8
-#: canaille/templates/profile_edit.html:52
-#: canaille/templates/profile_settings.html:6
-msgid "My profile"
-msgstr "Mon profil"
-
-#: canaille/templates/profile_edit.html:10
-#: canaille/templates/profile_edit.html:54
-#: canaille/templates/profile_settings.html:8
-msgid "User profile edition"
-msgstr "Édition d'un profil utilisateur"
-
+#: canaille/templates/profile_add.html:41
 #: canaille/templates/profile_edit.html:41
 #: canaille/templates/profile_settings.html:37
 msgid "This user cannot edit this field"
 msgstr "Cet utilisateur ne peut pas éditer ce champ"
 
+#: canaille/templates/profile_add.html:43
 #: canaille/templates/profile_edit.html:43
 #: canaille/templates/profile_settings.html:39
 msgid "This user cannot see this field"
 msgstr "Cet utilisateur ne peut pas voir ce champ"
 
-#: canaille/templates/profile_edit.html:60
-msgid "Edit your personal information"
-msgstr "Éditez vos informations personnelles"
-
-#: canaille/templates/profile_edit.html:62
-msgid "Edit information about a user"
-msgstr "Éditez les informations d'un utilisateur"
-
+#: canaille/templates/profile_add.html:52
 #: canaille/templates/profile_settings.html:48
 msgid "Account deletion"
 msgstr "Suppression d'un compte"
 
+#: canaille/templates/profile_add.html:57
 #: canaille/templates/profile_settings.html:53
 msgid ""
 "Are you sure you want to delete this user? This action is unrevokable and "
@@ -1016,6 +972,7 @@ msgstr ""
 "Êtes-vous sûrs de vouloir supprimer cet utilisateur ? Cette action est "
 "irrévocable, et toutes les données de cet utilisateur seront supprimées."
 
+#: canaille/templates/profile_add.html:59
 #: canaille/templates/profile_settings.html:55
 msgid ""
 "Are you sure you want to delete your account? This action is unrevokable and "
@@ -1024,47 +981,176 @@ msgstr ""
 "Êtes-vous sûrs de vouloir supprimer votre compte ? Cette action est "
 "irrévocable et toutes vos données seront supprimées pour toujours."
 
-#: canaille/templates/profile_settings.html:98
+#: canaille/templates/profile_add.html:76
+#: canaille/templates/profile_edit.html:8
+#: canaille/templates/profile_edit.html:52
+#: canaille/templates/profile_settings.html:6
+msgid "My profile"
+msgstr "Mon profil"
+
+#: canaille/templates/profile_add.html:78
+#: canaille/templates/profile_edit.html:10
+#: canaille/templates/profile_edit.html:54
+#: canaille/templates/profile_settings.html:8
+msgid "User profile edition"
+msgstr "Édition d'un profil utilisateur"
+
+#: canaille/templates/profile_add.html:84
+msgid "Create a new user account"
+msgstr "Création d'un nouveau compte utilisateur"
+
+#: canaille/templates/profile_add.html:86
+#: canaille/templates/profile_edit.html:60
+msgid "Edit your personal information"
+msgstr "Éditez vos informations personnelles"
+
+#: canaille/templates/profile_add.html:88
+#: canaille/templates/profile_edit.html:62
+msgid "Edit information about a user"
+msgstr "Éditez les informations d'un utilisateur"
+
+#: canaille/templates/profile_add.html:94
+#: canaille/templates/profile_edit.html:23
+#: canaille/templates/profile_settings.html:21
+msgid "Personal information"
+msgstr "Informations personnelles"
+
+#: canaille/templates/profile_add.html:106
+#: canaille/templates/profile_add.html:117
+#: canaille/templates/profile_edit.html:78
+#: canaille/templates/profile_edit.html:89
+msgid "Click to upload a photo"
+msgstr "Cliquez pour mettre en ligne une photo"
+
+#: canaille/templates/profile_add.html:206
+#: canaille/templates/profile_edit.html:27
+#: canaille/templates/profile_settings.html:25
+#: canaille/templates/profile_settings.html:91
+msgid "Account information"
+msgstr "Informations sur le compte"
+
+#: canaille/templates/profile_add.html:230
+msgid "User password is not mandatory"
+msgstr "Le mot de passe utilisateur n'est pas requis à la création"
+
+#: canaille/templates/profile_add.html:233
+msgid "The user password can be set:"
+msgstr "Il pourra être renseigné :"
+
+#: canaille/templates/profile_add.html:235
+msgid "by filling this form;"
+msgstr "en remplissant ce formulaire ;"
+
+#: canaille/templates/profile_add.html:236
+msgid ""
+"by sending the user a password initialization mail, after the account "
+"creation;"
+msgstr ""
+"en envoyant un lien d'initialisation de mot de passe, par courriel à "
+"l'utilisateur, après la création de son compte ;"
+
+#: canaille/templates/profile_add.html:237
+#: canaille/templates/profile_settings.html:135
+msgid ""
+"or simply waiting for the user to sign-in a first time, and then receive a "
+"password initialization mail."
+msgstr ""
+"ou simplement en attendant la première connexion de l'utilisateur, afin "
+"qu'il reçoive un lien d'initialisation de mot de passe par courriel."
+
+#: canaille/templates/profile_add.html:242
+msgid ""
+"The user will not be able to authenticate unless the password is set, but "
+"they will be able to ask for a password initialization mail."
+msgstr ""
+"Le nouvel utilisateur ne pourra pas se connecter tant que son mot de passe "
+"n'est pas défini, mais sera en mesure de demander l'envoi d'un email "
+"d'initialisation de mot de passe."
+
+#: canaille/templates/profile_add.html:244
+msgid "The user will not be able to authenticate unless the password is set."
+msgstr ""
+"L'utilisateur ne pourra pas se connecter tant que son mot de passe n'est pas "
+"défini."
+
+#: canaille/templates/profile_add.html:255
+#: canaille/templates/profile_settings.html:199
+msgid "Submit"
+msgstr "Valider"
+
+#: canaille/templates/profile_settings.html:70
+#, fuzzy
+#| msgid "Account deletion"
+msgid "Account locking"
+msgstr "Suppression d'un compte"
+
+#: canaille/templates/profile_settings.html:75
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to revoke this token? This action is unrevokable."
+msgid ""
+"Are you sure you want to lock this account? The user won't be able to login "
+"until their account is unlocked."
+msgstr ""
+"Êtes-vous sûrs de vouloir révoquer ce jeton ? Cette action est irrévocable."
+
+#: canaille/templates/profile_settings.html:77
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to delete your account? This action is unrevokable "
+#| "and all your data will be removed forever."
+msgid ""
+"Are you sure you want to lock your account? You won't be abel to login until "
+"your account is unlocked."
+msgstr ""
+"Êtes-vous sûrs de vouloir supprimer votre compte ? Cette action est "
+"irrévocable et toutes vos données seront supprimées pour toujours."
+
+#: canaille/templates/profile_settings.html:83
+msgid "Lock"
+msgstr ""
+
+#: canaille/templates/profile_settings.html:124
 msgid "Send email"
 msgstr "Envoyer le courriel"
 
-#: canaille/templates/profile_settings.html:102
+#: canaille/templates/profile_settings.html:128
 msgid "This user does not have a password yet"
 msgstr "L'utilisateur n'a pas encore de mot de passe"
 
-#: canaille/templates/profile_settings.html:105
+#: canaille/templates/profile_settings.html:131
 msgid "You can solve this by:"
 msgstr "Vous pouvez régler ceci en :"
 
-#: canaille/templates/profile_settings.html:107
+#: canaille/templates/profile_settings.html:133
 msgid "setting a password using this form;"
 msgstr "renseignant un mot de passe via ce formulaire ;"
 
-#: canaille/templates/profile_settings.html:108
+#: canaille/templates/profile_settings.html:134
 msgid ""
 "sending the user a password initialization mail, by clicking this button;"
 msgstr ""
 "envoyant un lien d'initialisation de mot de passe, par courriel à "
 "l'utilisateur, en cliquant sur ce bouton ;"
 
-#: canaille/templates/profile_settings.html:112
+#: canaille/templates/profile_settings.html:138
 msgid "The user will not be able to authenticate unless the password is set"
 msgstr ""
 "L'utilisateur ne pourra pas se connecter tant que son mot de passe n'est pas "
 "défini"
 
-#: canaille/templates/profile_settings.html:120
+#: canaille/templates/profile_settings.html:146
 msgid "Send mail"
 msgstr "Envoyer le courriel"
 
 #: canaille/templates/mail/admin.html:97
-#: canaille/templates/profile_settings.html:123
+#: canaille/templates/profile_settings.html:149
 #: canaille/templates/reset-password.html:11
 #: canaille/templates/reset-password.html:16
 msgid "Password reset"
 msgstr "Réinitialisation du mot de passe"
 
-#: canaille/templates/profile_settings.html:125
+#: canaille/templates/profile_settings.html:151
 msgid ""
 "If the user has forgotten his password, you can send him a password reset "
 "email by clicking this button."
@@ -1072,15 +1158,40 @@ msgstr ""
 "Si l'utilisateur a oublié son mot de passe, vous pouvez lui envoyer un "
 "courriel contenant un lien de réinitialisation en cliquant sur ce bouton."
 
-#: canaille/templates/profile_settings.html:137
+#: canaille/templates/profile_settings.html:160
+msgid "Unlock"
+msgstr ""
+
+#: canaille/templates/profile_settings.html:163
+#, fuzzy
+#| msgid "This user can edit this field"
+msgid "This user account is locked"
+msgstr "Cet utilisateur peut éditer ce champ"
+
+#: canaille/templates/profile_settings.html:166
+#, fuzzy
+#| msgid ""
+#| "The user will not be able to authenticate unless the password is set."
+msgid "The user won't be able to connect until their account is unlocked."
+msgstr ""
+"L'utilisateur ne pourra pas se connecter tant que son mot de passe n'est pas "
+"défini."
+
+#: canaille/templates/profile_settings.html:178
+#, fuzzy
+#| msgid "Delete my account"
+msgid "Lock the account"
+msgstr "Supprimer mon compte"
+
+#: canaille/templates/profile_settings.html:185
 msgid "Delete the user"
 msgstr "Supprimer l'utilisateur"
 
-#: canaille/templates/profile_settings.html:139
+#: canaille/templates/profile_settings.html:187
 msgid "Delete my account"
 msgstr "Supprimer mon compte"
 
-#: canaille/templates/profile_settings.html:146
+#: canaille/templates/profile_settings.html:194
 msgid "Impersonate"
 msgstr "Prendre l'identité"
 
@@ -1089,14 +1200,14 @@ msgstr "Prendre l'identité"
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: canaille/templates/macro/form.html:67
+#: canaille/templates/macro/form.html:60
 #: canaille/templates/oidc/admin/client_edit.html:63
 #: canaille/templates/oidc/admin/client_edit.html:72
 #: canaille/templates/oidc/admin/client_edit.html:81
 msgid "This field is not editable"
 msgstr "Ce champ n'est pas modifiable"
 
-#: canaille/templates/macro/form.html:71
+#: canaille/templates/macro/form.html:64
 msgid "This field is required"
 msgstr "Ce champ est requis"
 
@@ -1119,7 +1230,7 @@ msgstr "%(nb_items)s élément(s)"
 
 #: canaille/templates/mail/admin.html:5 canaille/templates/mail/admin.html:12
 #: canaille/templates/oidc/admin/authorization_list.html:16
-#: canaille/templates/oidc/admin/authorization_view.html:12
+#: canaille/templates/oidc/admin/authorization_view.html:11
 #: canaille/templates/oidc/admin/client_add.html:12
 #: canaille/templates/oidc/admin/client_edit.html:16
 #: canaille/templates/oidc/admin/client_list.html:16
@@ -1130,7 +1241,7 @@ msgstr "Courriels"
 
 #: canaille/templates/mail/admin.html:16
 #: canaille/templates/oidc/admin/authorization_list.html:20
-#: canaille/templates/oidc/admin/authorization_view.html:16
+#: canaille/templates/oidc/admin/authorization_view.html:15
 #: canaille/templates/oidc/admin/client_add.html:16
 #: canaille/templates/oidc/admin/client_edit.html:20
 #: canaille/templates/oidc/admin/client_list.html:5
@@ -1143,7 +1254,7 @@ msgstr "Clients"
 
 #: canaille/templates/mail/admin.html:20
 #: canaille/templates/oidc/admin/authorization_list.html:24
-#: canaille/templates/oidc/admin/authorization_view.html:20
+#: canaille/templates/oidc/admin/authorization_view.html:19
 #: canaille/templates/oidc/admin/client_add.html:5
 #: canaille/templates/oidc/admin/client_add.html:20
 #: canaille/templates/oidc/admin/client_add.html:36
@@ -1156,7 +1267,7 @@ msgstr "Ajouter un client"
 
 #: canaille/templates/mail/admin.html:24
 #: canaille/templates/oidc/admin/authorization_list.html:28
-#: canaille/templates/oidc/admin/authorization_view.html:24
+#: canaille/templates/oidc/admin/authorization_view.html:23
 #: canaille/templates/oidc/admin/client_add.html:24
 #: canaille/templates/oidc/admin/client_edit.html:28
 #: canaille/templates/oidc/admin/client_list.html:28
@@ -1171,7 +1282,7 @@ msgstr "Jetons"
 #: canaille/templates/oidc/admin/authorization_list.html:5
 #: canaille/templates/oidc/admin/authorization_list.html:32
 #: canaille/templates/oidc/admin/authorization_list.html:41
-#: canaille/templates/oidc/admin/authorization_view.html:28
+#: canaille/templates/oidc/admin/authorization_view.html:27
 #: canaille/templates/oidc/admin/client_add.html:28
 #: canaille/templates/oidc/admin/client_edit.html:32
 #: canaille/templates/oidc/admin/client_list.html:32
@@ -1313,14 +1424,16 @@ msgstr ""
 "Ce courriel est une vérification que vous recevez les communications du site "
 "%(site_name)s."
 
-#: canaille/templates/oidc/admin/authorization_view.html:5
-#: canaille/templates/oidc/admin/authorization_view.html:36
+#: canaille/templates/oidc/admin/authorization_view.html:4
+#: canaille/templates/oidc/admin/authorization_view.html:35
 msgid "View an authorization"
 msgstr "Voir une autorisation"
 
 #: canaille/templates/oidc/admin/client_add.html:39
-msgid "Confirm"
-msgstr "Confirmer"
+#, fuzzy
+#| msgid "Created"
+msgid "Create"
+msgstr "Créé"
 
 #: canaille/templates/oidc/admin/client_edit.html:5
 #: canaille/templates/oidc/admin/client_edit.html:54
@@ -1355,10 +1468,6 @@ msgstr "Créé le"
 msgid "Delete the client"
 msgstr "Supprimer le client"
 
-#: canaille/templates/oidc/admin/client_edit.html:98
-msgid "Edit"
-msgstr "Modifier"
-
 #: canaille/templates/oidc/admin/token_view.html:5
 #: canaille/templates/oidc/admin/token_view.html:57
 msgid "Token details"
@@ -1453,7 +1562,7 @@ msgstr "Mes autorisations"
 
 #: canaille/templates/oidc/user/consent_list.html:20
 #: canaille/templates/oidc/user/preconsent_list.html:20
-#: canaille/templates/oidc/user/preconsent_list.html:31
+#: canaille/templates/oidc/user/preconsent_list.html:30
 msgid "Pre-authorized applications"
 msgstr "Applications pré-autorisées"
 
@@ -1474,17 +1583,17 @@ msgid "Had access to:"
 msgstr "Avait accès à :"
 
 #: canaille/templates/oidc/user/consent_list.html:61
-#: canaille/templates/oidc/user/preconsent_list.html:51
+#: canaille/templates/oidc/user/preconsent_list.html:52
 msgid "Has access to:"
 msgstr "A accès à :"
 
 #: canaille/templates/oidc/user/consent_list.html:84
-#: canaille/templates/oidc/user/preconsent_list.html:73
+#: canaille/templates/oidc/user/preconsent_list.html:74
 msgid "Policy"
 msgstr "Politique de confidentialité"
 
 #: canaille/templates/oidc/user/consent_list.html:92
-#: canaille/templates/oidc/user/preconsent_list.html:81
+#: canaille/templates/oidc/user/preconsent_list.html:82
 msgid "Terms of service"
 msgstr "Conditions d'utilisation"
 
@@ -1493,7 +1602,7 @@ msgid "Restore access"
 msgstr "Restaurer l'accès"
 
 #: canaille/templates/oidc/user/consent_list.html:104
-#: canaille/templates/oidc/user/preconsent_list.html:87
+#: canaille/templates/oidc/user/preconsent_list.html:88
 msgid "Revoke access"
 msgstr "Révoquer l'accès"
 
@@ -1529,11 +1638,20 @@ msgstr "Rester connecté"
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: canaille/templates/oidc/user/preconsent_list.html:34
+#: canaille/templates/oidc/user/preconsent_list.html:33
 msgid ""
 "Those applications automatically have authorizations to access you data."
 msgstr "Ces applications bénéficient automatiquement d'un accès à vos données."
 
+#: canaille/templates/oidc/user/preconsent_list.html:97
+#: canaille/templates/partial/groups.html:36
+#: canaille/templates/partial/oidc/admin/authorization_list.html:36
+#: canaille/templates/partial/oidc/admin/client_list.html:40
+#: canaille/templates/partial/oidc/admin/token_list.html:44
+#: canaille/templates/partial/users.html:70
+msgid "There is nothing here"
+msgstr "Il n'y a rien ici"
+
 #: canaille/templates/partial/groups.html:8
 msgid "Number of members"
 msgstr "Nombre de membres"
@@ -1542,7 +1660,7 @@ msgstr "Nombre de membres"
 #: canaille/templates/partial/oidc/admin/authorization_list.html:31
 #: canaille/templates/partial/oidc/admin/client_list.html:35
 #: canaille/templates/partial/oidc/admin/token_list.html:39
-#: canaille/templates/partial/users.html:63
+#: canaille/templates/partial/users.html:65
 msgid "No item matches your request"
 msgstr "Aucun élément ne correspond à votre requête"
 
@@ -1550,17 +1668,13 @@ msgstr "Aucun élément ne correspond à votre requête"
 #: canaille/templates/partial/oidc/admin/authorization_list.html:33
 #: canaille/templates/partial/oidc/admin/client_list.html:37
 #: canaille/templates/partial/oidc/admin/token_list.html:41
-#: canaille/templates/partial/users.html:65
+#: canaille/templates/partial/users.html:67
 msgid "Maybe try with different criterias?"
 msgstr "Essayez peut-être avec des critères différents ?"
 
-#: canaille/templates/partial/groups.html:36
-#: canaille/templates/partial/oidc/admin/authorization_list.html:36
-#: canaille/templates/partial/oidc/admin/client_list.html:40
-#: canaille/templates/partial/oidc/admin/token_list.html:44
-#: canaille/templates/partial/users.html:68
-msgid "There is nothing here"
-msgstr "Il n'y a rien ici"
+#: canaille/templates/partial/users.html:29
+msgid "This account is locked"
+msgstr ""
 
 #: canaille/templates/partial/oidc/admin/authorization_list.html:5
 msgid "Code"
@@ -1596,6 +1710,9 @@ msgstr "Autorisations"
 msgid "Admin"
 msgstr "Administration"
 
+#~ msgid "Confirm"
+#~ msgstr "Confirmer"
+
 #~ msgid "Employee number"
 #~ msgstr "Numéro de l'employé"
 
@@ -1662,9 +1779,6 @@ msgstr "Administration"
 #~ msgid "Members"
 #~ msgstr "Membres"
 
-#~ msgid "This user can edit this field"
-#~ msgstr "Cet utilisateur peut éditer ce champ"
-
 #~ msgid ""
 #~ "\n"
 #~ "        It seems this is the first time you are logging here. In order to "
@@ -1775,9 +1889,6 @@ msgstr "Administration"
 #~ "vous pouvez cliquer sur le bouton «Créer mon compte» ci-dessous et suivre "
 #~ "les instructions."
 
-#~ msgid "Could not reset your password"
-#~ msgstr "Impossible de réinitialiser votre mot de passe"
-
 #~ msgid "Nothing here"
 #~ msgstr "Rien ici"
 
diff --git a/canaille/translations/gl/LC_MESSAGES/messages.po b/canaille/translations/gl/LC_MESSAGES/messages.po
index e1cceb53..c64ec201 100644
--- a/canaille/translations/gl/LC_MESSAGES/messages.po
+++ b/canaille/translations/gl/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-03-29 23:00+0200\n"
+"POT-Creation-Date: 2023-05-26 15:31+0200\n"
 "PO-Revision-Date: 2023-02-19 22:35+0000\n"
 "Last-Translator: Jesús P Rey <i18n@chuso.net>\n"
 "Language-Team: Galician <https://hosted.weblate.org/projects/canaille/"
@@ -19,22 +19,71 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "Generated-By: Babel 2.12.1\n"
 
-#: canaille/account.py:105 canaille/account.py:130
-#: canaille/oidc/endpoints.py:84
+#: canaille/app/flask.py:65
+msgid "No SMTP server has been configured"
+msgstr "Non se configurou un servidor SMTP"
+
+#: canaille/app/forms.py:20
+msgid "This is not a valid URL"
+msgstr ""
+
+#: canaille/app/forms.py:83
+#, fuzzy
+msgid "The page number is not valid"
+msgstr "O acceso non está revogado"
+
+#: canaille/backends/ldap/backend.py:98
+msgid "Could not connect to the LDAP server '{uri}'"
+msgstr "Non foi posible conectar co servidor LDAP '{uri}'"
+
+#: canaille/backends/ldap/backend.py:114
+msgid "LDAP authentication failed with user '{user}'"
+msgstr "Fallou a autenticación LDAP co usuario '{user}'"
+
+#: canaille/backends/ldap/backend.py:214
+msgid "John Doe"
+msgstr "John Doe"
+
+#: canaille/backends/ldap/backend.py:217 canaille/core/forms.py:124
+#: canaille/core/forms.py:340
+msgid "jdoe"
+msgstr "jdoe"
+
+#: canaille/backends/ldap/backend.py:220
+msgid "john@doe.com"
+msgstr "john@doe.com"
+
+#: canaille/backends/ldap/backend.py:222
+msgid " or "
+msgstr " ou "
+
+#: canaille/backends/ldap/models.py:121
+#, fuzzy
+#| msgid "Your account has already been created."
+msgid "Your account has been locked."
+msgstr "A túa conta xa existe."
+
+#: canaille/backends/ldap/models.py:126
+msgid "You should change your password."
+msgstr ""
+
+#: canaille/core/account.py:97 canaille/core/account.py:120
+#: canaille/core/account.py:128 canaille/oidc/endpoints.py:81
+#: canaille/oidc/endpoints.py:87
 msgid "Login failed, please check your information"
 msgstr "Fallou o inicio de sesión, comproba as túas credenciais"
 
-#: canaille/account.py:136 canaille/account.py:621
+#: canaille/core/account.py:136 canaille/core/account.py:667
 #, python-format
 msgid "Connection successful. Welcome %(user)s"
 msgstr "Acceso correcto. Benvido/a %(user)s"
 
-#: canaille/account.py:149
+#: canaille/core/account.py:151
 #, python-format
 msgid "You have been disconnected. See you next time %(user)s"
 msgstr "A sesión foi desconectada. Deica logo, %(user)s"
 
-#: canaille/account.py:169
+#: canaille/core/account.py:175
 msgid ""
 "A password initialization link has been sent at your email address. You "
 "should receive it within a few minutes."
@@ -42,56 +91,56 @@ msgstr ""
 "Enviouse unha ligazón de inicialización do contrasinal ó teu correo "
 "electrónico. Deberías recibila nun prazo de 10 minutos."
 
-#: canaille/account.py:175 canaille/account.py:524
+#: canaille/core/account.py:181 canaille/core/account.py:537
 msgid "Could not send the password initialization email"
 msgstr "Non foi posible enviar o email de inicialización do contrasinal"
 
-#: canaille/account.py:267 canaille/account.py:295
+#: canaille/core/account.py:275 canaille/core/account.py:303
 msgid "The invitation link that brought you here was invalid."
 msgstr "A ligazón de invitación coa que accediches non é válida."
 
-#: canaille/account.py:274
+#: canaille/core/account.py:282
 msgid "The invitation link that brought you here has expired."
 msgstr "A ligazón de invitación coa que accediches expirou."
 
-#: canaille/account.py:281
+#: canaille/core/account.py:289
 msgid "Your account has already been created."
 msgstr "A túa conta xa existe."
 
-#: canaille/account.py:288
+#: canaille/core/account.py:296
 msgid "You are already logged in, you cannot create an account."
 msgstr "Xa iniciaches sesión, non podes crear unha conta."
 
-#: canaille/account.py:307 canaille/forms.py:289 canaille/forms.py:370
-#: canaille/templates/groups.html:5 canaille/templates/groups.html:25
-#: canaille/templates/partial/users.html:18
+#: canaille/core/account.py:319 canaille/core/forms.py:263
+#: canaille/core/forms.py:358 canaille/templates/groups.html:5
+#: canaille/templates/groups.html:25 canaille/templates/partial/users.html:18
 #: canaille/themes/default/base.html:61
 msgid "Groups"
 msgstr "Grupos"
 
-#: canaille/account.py:329 canaille/account.py:358
+#: canaille/core/account.py:341 canaille/core/account.py:372
 msgid "User account creation failed."
 msgstr "Fallou a creación da conta de usuario."
 
-#: canaille/account.py:334
+#: canaille/core/account.py:346
 #, fuzzy
 #| msgid "You account has been created successfuly."
 msgid "Your account has been created successfuly."
 msgstr "A túa conta creouse correctamente."
 
-#: canaille/account.py:399
+#: canaille/core/account.py:412
 msgid "User account creation succeed."
 msgstr "Conta creada correctamente."
 
-#: canaille/account.py:460 canaille/account.py:567
+#: canaille/core/account.py:472 canaille/core/account.py:602
 msgid "Profile edition failed."
 msgstr "Fallou a actualización do perfil."
 
-#: canaille/account.py:486 canaille/account.py:582
+#: canaille/core/account.py:495 canaille/core/account.py:624
 msgid "Profile updated successfuly."
 msgstr "Perfil actualizado correctamente."
 
-#: canaille/account.py:518
+#: canaille/core/account.py:531
 msgid ""
 "A password initialization link has been sent at the user email address. It "
 "should be received within a few minutes."
@@ -99,7 +148,7 @@ msgstr ""
 "A ligazón de inicialización do contrasinal enviouse á dirección de correo "
 "electrónico do usuario. Deberías recibilo nun prazo de 10 minutos."
 
-#: canaille/account.py:531
+#: canaille/core/account.py:544
 msgid ""
 "A password reset link has been sent at the user email address. It should be "
 "received within a few minutes."
@@ -107,20 +156,32 @@ msgstr ""
 "A ligazón para restablecer o contrasinal enviouse á dirección de correo "
 "electrónico do usuario. Deberías recibilo nun prazo de 10 minutos."
 
-#: canaille/account.py:537
+#: canaille/core/account.py:550
 msgid "Could not send the password reset email"
 msgstr "Non foi posible enviar o email para restablecer o contrasinal"
 
-#: canaille/account.py:602
+#: canaille/core/account.py:559
+#, fuzzy
+#| msgid "The access has been revoked"
+msgid "The account has been locked"
+msgstr "O acceso foi revogado"
+
+#: canaille/core/account.py:570
+#, fuzzy
+#| msgid "The access has been revoked"
+msgid "The account has been unlocked"
+msgstr "O acceso foi revogado"
+
+#: canaille/core/account.py:644
 #, python-format
 msgid "The user %(user)s has been sucessfuly deleted"
 msgstr "O usuario %(user)s eliminouse correctamente"
 
-#: canaille/account.py:636
+#: canaille/core/account.py:684
 msgid "Could not send the password reset link."
 msgstr "Non foi posible enviar o email para restablecer o contrasinal."
 
-#: canaille/account.py:640
+#: canaille/core/account.py:688
 msgid ""
 "A password reset link has been sent at your email address. You should "
 "receive it within a few minutes."
@@ -128,7 +189,7 @@ msgstr ""
 "Enviouse unha ligazón para restablecer o contrasinal ó teu correo "
 "electrónico. Deberías recibilo nun prazo de 10 minutos."
 
-#: canaille/account.py:651
+#: canaille/core/account.py:699
 #, python-format
 msgid ""
 "The user '%(user)s' does not have permissions to update their password. We "
@@ -137,372 +198,344 @@ msgstr ""
 "O usuario '%(user)s' non ten permiso para actualizar o seu contrasinal. Non "
 "é posible enviarlle un email para que restableza o seu contrasinal."
 
-#: canaille/account.py:666
+#: canaille/core/account.py:714
 msgid "We encountered an issue while we sent the password recovery email."
 msgstr "Produciuse un problema enviando o email para recuperar o contrasinal."
 
-#: canaille/account.py:685
+#: canaille/core/account.py:735
 msgid "The password reset link that brought you here was invalid."
 msgstr ""
 "A ligazón para restablecer o contrasinal co que accediches non é válido."
 
-#: canaille/account.py:694
+#: canaille/core/account.py:744
 msgid "Your password has been updated successfuly"
 msgstr "O teu contrasinal actualizouse correctamente"
 
-#: canaille/admin.py:23 canaille/templates/partial/users.html:15
+#: canaille/core/admin.py:23 canaille/templates/partial/users.html:15
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: canaille/admin.py:29 canaille/forms.py:85 canaille/forms.py:109
-#: canaille/forms.py:197 canaille/forms.py:364
+#: canaille/core/admin.py:29 canaille/core/forms.py:56
+#: canaille/core/forms.py:80 canaille/core/forms.py:168
+#: canaille/core/forms.py:352
 msgid "jane@doe.com"
 msgstr "jane@doe.com"
 
-#: canaille/admin.py:42
+#: canaille/core/admin.py:42
 msgid "The test invitation mail has been sent correctly"
 msgstr "O email de invitación de proba enviouse correctamente"
 
-#: canaille/admin.py:44
+#: canaille/core/admin.py:44
 msgid "The test invitation mail has not been sent correctly"
 msgstr "Non se puido enviar o email de invitación de proba"
 
-#: canaille/admin.py:89 canaille/mails.py:187
+#: canaille/core/admin.py:89 canaille/core/mails.py:92
 msgid "Password initialization on {website_name}"
 msgstr "Inicialización do contrasinal en {website_name}"
 
-#: canaille/admin.py:131 canaille/mails.py:147
+#: canaille/core/admin.py:131 canaille/core/mails.py:52
 msgid "Password reset on {website_name}"
 msgstr "Restablecer contrasinal en {website_name}"
 
-#: canaille/admin.py:173
+#: canaille/core/admin.py:173
 msgid "Invitation on {website_name}"
 msgstr "Invitación a {website_name}"
 
-#: canaille/apputils.py:32
-msgid "John Doe"
-msgstr "John Doe"
-
-#: canaille/apputils.py:35 canaille/forms.py:153 canaille/forms.py:352
-msgid "jdoe"
-msgstr "jdoe"
-
-#: canaille/apputils.py:38
-msgid "john@doe.com"
-msgstr "john@doe.com"
-
-#: canaille/apputils.py:40
-msgid " or "
-msgstr " ou "
-
-#: canaille/flaskutils.py:63
-msgid "No SMTP server has been configured"
-msgstr "Non se configurou un servidor SMTP"
-
-#: canaille/forms.py:19
-msgid "This is not a valid URL"
-msgstr ""
-
-#: canaille/forms.py:27
+#: canaille/core/forms.py:22
 msgid "The login '{login}' already exists"
 msgstr "O usuario '{login}' xa existe"
 
-#: canaille/forms.py:36
+#: canaille/core/forms.py:31
 #, fuzzy
 #| msgid "The email '{email}' already exists"
 msgid "The email '{email}' is already used"
 msgstr "O email '{email}' xa existe"
 
-#: canaille/forms.py:43
+#: canaille/core/forms.py:38
 msgid "The group '{group}' already exists"
 msgstr "O grupo '{group}' xa existe"
 
-#: canaille/forms.py:52
+#: canaille/core/forms.py:47
 msgid "The login '{login}' does not exist"
 msgstr "O usuario '{login}' non existe"
 
-#: canaille/forms.py:77
-#, fuzzy
-msgid "The page number is not valid"
-msgstr "O acceso non está revogado"
-
-#: canaille/forms.py:82 canaille/forms.py:106
+#: canaille/core/forms.py:53 canaille/core/forms.py:77
 #: canaille/templates/partial/users.html:9
 msgid "Login"
 msgstr "Usuario"
 
-#: canaille/forms.py:95 canaille/forms.py:118 canaille/forms.py:242
+#: canaille/core/forms.py:66 canaille/core/forms.py:89
+#: canaille/core/forms.py:213
 msgid "Password"
 msgstr "Contrasinal"
 
-#: canaille/forms.py:125 canaille/forms.py:249
+#: canaille/core/forms.py:96 canaille/core/forms.py:223
 msgid "Password confirmation"
 msgstr "Repetir contrasinal"
 
-#: canaille/forms.py:128 canaille/forms.py:252
+#: canaille/core/forms.py:99 canaille/core/forms.py:226
 msgid "Password and confirmation do not match."
 msgstr "Os dous contrasinais non coinciden."
 
-#: canaille/forms.py:147
+#: canaille/core/forms.py:118
 msgid "Automatic"
 msgstr "Automático"
 
-#: canaille/forms.py:152 canaille/forms.py:351
+#: canaille/core/forms.py:123 canaille/core/forms.py:339
 msgid "Username"
 msgstr "Nome de usuario"
 
-#: canaille/forms.py:156 canaille/forms.py:323 canaille/forms.py:337
-#: canaille/oidc/forms.py:22 canaille/templates/partial/groups.html:6
+#: canaille/core/forms.py:127 canaille/core/forms.py:311
+#: canaille/core/forms.py:325 canaille/oidc/forms.py:22
+#: canaille/templates/partial/groups.html:6
 #: canaille/templates/partial/oidc/admin/client_list.html:6
 #: canaille/templates/partial/users.html:12
 msgid "Name"
 msgstr "Nome"
 
-#: canaille/forms.py:158
+#: canaille/core/forms.py:129
 msgid "Title"
 msgstr ""
 
-#: canaille/forms.py:158
+#: canaille/core/forms.py:129
 msgid "Vice president"
 msgstr ""
 
-#: canaille/forms.py:161
+#: canaille/core/forms.py:132
 msgid "Given name"
 msgstr "Nome de pila"
 
-#: canaille/forms.py:163
+#: canaille/core/forms.py:134
 msgid "John"
 msgstr "John"
 
-#: canaille/forms.py:169
+#: canaille/core/forms.py:140
 msgid "Family Name"
 msgstr "Apelidos"
 
-#: canaille/forms.py:172
+#: canaille/core/forms.py:143
 msgid "Doe"
 msgstr "Doe"
 
-#: canaille/forms.py:178
+#: canaille/core/forms.py:149
 msgid "Display Name"
 msgstr "Nome a amosar"
 
-#: canaille/forms.py:181
+#: canaille/core/forms.py:152
 msgid "Johnny"
 msgstr "Johnny"
 
-#: canaille/forms.py:187 canaille/forms.py:357
+#: canaille/core/forms.py:158 canaille/core/forms.py:345
 msgid "Email address"
 msgstr "Correo electrónico"
 
-#: canaille/forms.py:193
+#: canaille/core/forms.py:164
 msgid ""
 "This email will be used as a recovery address to reset the password if needed"
 msgstr ""
 "O correo electrónico usarase como dirección para recuperar o contrasinal se "
 "é necesario"
 
-#: canaille/forms.py:203
+#: canaille/core/forms.py:174
 msgid "Phone number"
 msgstr "Número de teléfono"
 
-#: canaille/forms.py:203
+#: canaille/core/forms.py:174
 msgid "555-000-555"
 msgstr "+34 999 111 222"
 
-#: canaille/forms.py:206
+#: canaille/core/forms.py:177
 msgid "Address"
 msgstr "Dirección"
 
-#: canaille/forms.py:208
+#: canaille/core/forms.py:179
 #, fuzzy
 msgid "132, Foobar Street, Gotham City 12401, XX"
 msgstr "Rúa Real, 21, 12345 Nova Mombasa"
 
-#: canaille/forms.py:212
+#: canaille/core/forms.py:183
 #, fuzzy
 msgid "Street"
 msgstr "Clave"
 
-#: canaille/forms.py:214
+#: canaille/core/forms.py:185
 #, fuzzy
 msgid "132, Foobar Street"
 msgstr "Rúa Real, 21, 12345 Nova Mombasa"
 
-#: canaille/forms.py:218
+#: canaille/core/forms.py:189
 msgid "Postal Code"
 msgstr ""
 
-#: canaille/forms.py:224
+#: canaille/core/forms.py:195
 msgid "Locality"
 msgstr ""
 
-#: canaille/forms.py:226
+#: canaille/core/forms.py:197
 msgid "Gotham City"
 msgstr ""
 
-#: canaille/forms.py:230
+#: canaille/core/forms.py:201
 msgid "Region"
 msgstr ""
 
-#: canaille/forms.py:232
+#: canaille/core/forms.py:203
 msgid "North Pole"
 msgstr ""
 
-#: canaille/forms.py:236
+#: canaille/core/forms.py:207
 msgid "Photo"
 msgstr "Foto"
 
-#: canaille/forms.py:240 canaille/templates/profile_add.html:63
+#: canaille/core/forms.py:211 canaille/templates/profile_add.html:109
 #: canaille/templates/profile_edit.html:81
 msgid "Delete the photo"
 msgstr "Eliminar foto"
 
-#: canaille/forms.py:260
+#: canaille/core/forms.py:234
 #, fuzzy
 #| msgid "Username"
 msgid "User number"
 msgstr "Nome de usuario"
 
-#: canaille/forms.py:262 canaille/forms.py:268
+#: canaille/core/forms.py:236 canaille/core/forms.py:242
 msgid "1234"
 msgstr "1234"
 
-#: canaille/forms.py:266
+#: canaille/core/forms.py:240
 #, fuzzy
-msgid "Department number"
+msgid "Department"
 msgstr "Número de teléfono"
 
-#: canaille/forms.py:272
+#: canaille/core/forms.py:246
 #, fuzzy
 #| msgid "Invitation"
 msgid "Organization"
 msgstr "Invitación"
 
-#: canaille/forms.py:274
+#: canaille/core/forms.py:248
 msgid "Cogip LTD."
 msgstr ""
 
-#: canaille/forms.py:278
+#: canaille/core/forms.py:252
 msgid "Website"
 msgstr "Sitio web"
 
-#: canaille/forms.py:280
+#: canaille/core/forms.py:254
 msgid "https://mywebsite.tld"
 msgstr "https://example.com"
 
-#: canaille/forms.py:285
+#: canaille/core/forms.py:259
 msgid "Preferred language"
 msgstr "Idioma preferido"
 
-#: canaille/forms.py:291
+#: canaille/core/forms.py:267
 msgid "users, admins …"
 msgstr "usuarios, administradores…"
 
-#: canaille/forms.py:326
+#: canaille/core/forms.py:289
+#, fuzzy
+#| msgid "Account creation"
+msgid "Account expiration"
+msgstr "Creación de conta"
+
+#: canaille/core/forms.py:314
 msgid "group"
 msgstr "grupo"
 
-#: canaille/forms.py:330 canaille/forms.py:344
+#: canaille/core/forms.py:318 canaille/core/forms.py:332
 #: canaille/templates/partial/groups.html:7
 msgid "Description"
 msgstr "Descripción"
 
-#: canaille/forms.py:355
+#: canaille/core/forms.py:343
 msgid "Username editable by the invitee"
 msgstr "Nome de usuario editable polo invitado"
 
-#: canaille/groups.py:38
+#: canaille/core/groups.py:37
 msgid "Group creation failed."
 msgstr "Fallou a creación do grupo."
 
-#: canaille/groups.py:46
+#: canaille/core/groups.py:45
 #, python-format
 msgid "The group %(group)s has been sucessfully created"
 msgstr "O grupo %(group)s creouse correctamente"
 
-#: canaille/groups.py:98
+#: canaille/core/groups.py:97
 #, python-format
 msgid "The group %(group)s has been sucessfully edited."
 msgstr "O grupo %(group)s actualizouse correctamente."
 
-#: canaille/groups.py:106
+#: canaille/core/groups.py:105
 msgid "Group edition failed."
 msgstr "Fallou a actualización do grupo."
 
-#: canaille/groups.py:120
+#: canaille/core/groups.py:119
 #, python-format
 msgid "The group %(group)s has been sucessfully deleted"
 msgstr "O grupo %(group)s eliminouse correctamente"
 
-#: canaille/mails.py:109
+#: canaille/core/mails.py:14
 msgid "Test email from {website_name}"
 msgstr "Email de proba de {website_name}"
 
-#: canaille/mails.py:217
+#: canaille/core/mails.py:122
 msgid "You have been invited to create an account on {website_name}"
 msgstr "Fuches invitado a crear unha conta en (website_name)"
 
-#: canaille/ldap_backend/backend.py:61
-msgid "Could not connect to the LDAP server '{uri}'"
-msgstr "Non foi posible conectar co servidor LDAP '{uri}'"
-
-#: canaille/ldap_backend/backend.py:77
-msgid "LDAP authentication failed with user '{user}'"
-msgstr "Fallou a autenticación LDAP co usuario '{user}'"
-
-#: canaille/oidc/clients.py:46
+#: canaille/oidc/clients.py:47
 msgid "The client has not been added. Please check your information."
 msgstr "O cliente non foi engadido. Comproba a información."
 
-#: canaille/oidc/clients.py:82
+#: canaille/oidc/clients.py:83
 msgid "The client has been created."
 msgstr "O cliente foi creado."
 
-#: canaille/oidc/clients.py:126
+#: canaille/oidc/clients.py:131
 msgid "The client has not been edited. Please check your information."
 msgstr "O cliente non foi actualizado. Comproba a información."
 
-#: canaille/oidc/clients.py:155
+#: canaille/oidc/clients.py:160
 msgid "The client has been edited."
 msgstr "O cliente foi actualizado."
 
-#: canaille/oidc/clients.py:168
+#: canaille/oidc/clients.py:173
 msgid "The client has been deleted."
 msgstr "O cliente foi eliminado."
 
-#: canaille/oidc/consents.py:73 canaille/oidc/consents.py:112
+#: canaille/oidc/consents.py:74 canaille/oidc/consents.py:113
 msgid "Could not revoke this access"
 msgstr "Non foi posible revogar este acceso"
 
-#: canaille/oidc/consents.py:76
+#: canaille/oidc/consents.py:77
 msgid "The access is already revoked"
 msgstr "Acceso xa revogado"
 
-#: canaille/oidc/consents.py:80 canaille/oidc/consents.py:129
+#: canaille/oidc/consents.py:81 canaille/oidc/consents.py:130
 msgid "The access has been revoked"
 msgstr "O acceso foi revogado"
 
-#: canaille/oidc/consents.py:91
+#: canaille/oidc/consents.py:92
 msgid "Could not restore this access"
 msgstr "Non foi posible restaurar este acceso"
 
-#: canaille/oidc/consents.py:94
+#: canaille/oidc/consents.py:95
 msgid "The access is not revoked"
 msgstr "O acceso non está revogado"
 
-#: canaille/oidc/consents.py:101
+#: canaille/oidc/consents.py:102
 msgid "The access has been restored"
 msgstr "O acceso foi restaurado"
 
-#: canaille/oidc/endpoints.py:135
+#: canaille/oidc/endpoints.py:142
 msgid "You have been successfully logged out."
 msgstr "A sesión foi pechada correctamente."
 
-#: canaille/oidc/endpoints.py:341
+#: canaille/oidc/endpoints.py:348
 msgid "You have been disconnected"
 msgstr "Fuches desconectado"
 
-#: canaille/oidc/endpoints.py:358
+#: canaille/oidc/endpoints.py:365
 msgid "You have not been disconnected"
 msgstr "Non fuches desconectado"
 
@@ -574,7 +607,7 @@ msgstr "URI de JKW"
 msgid "Pre-consent"
 msgstr "Preconsentemento"
 
-#: canaille/oidc/tokens.py:58
+#: canaille/oidc/tokens.py:56
 msgid "The token has successfully been revoked."
 msgstr "O token foi revogado correctamente."
 
@@ -744,13 +777,16 @@ msgstr ""
 #: canaille/templates/group.html:44
 #: canaille/templates/oidc/admin/client_edit.html:47
 #: canaille/templates/oidc/admin/token_view.html:50
+#: canaille/templates/profile_add.html:64
 #: canaille/templates/profile_settings.html:60
+#: canaille/templates/profile_settings.html:82
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: canaille/templates/group.html:45
 #: canaille/templates/oidc/admin/client_edit.html:48
 #: canaille/templates/oidc/admin/token_view.html:51
+#: canaille/templates/profile_add.html:65
 #: canaille/templates/profile_settings.html:61
 msgid "Delete"
 msgstr "Eliminar"
@@ -781,11 +817,11 @@ msgstr "Eliminar grupo"
 msgid "Create group"
 msgstr "Crear grupo"
 
-#: canaille/templates/group.html:90 canaille/templates/profile_add.html:210
+#: canaille/templates/group.html:90
+#: canaille/templates/oidc/admin/client_edit.html:98
 #: canaille/templates/profile_edit.html:181
-#: canaille/templates/profile_settings.html:151
-msgid "Submit"
-msgstr "Enviar"
+msgid "Edit"
+msgstr "Editar"
 
 #: canaille/templates/group.html:102
 msgid "Group members"
@@ -910,114 +946,29 @@ msgstr "Non son %(username)s"
 msgid "Sign in"
 msgstr "Iniciar sesión"
 
-#: canaille/templates/profile_add.html:5 canaille/templates/profile_add.html:40
+#: canaille/templates/profile_add.html:5 canaille/templates/profile_add.html:74
 #: canaille/templates/profile_edit.html:6
 msgid "User creation"
 msgstr "Crear usuario"
 
-#: canaille/templates/profile_add.html:44
-msgid "Create a new user account"
-msgstr "Crear nova conta de usuario"
-
-#: canaille/templates/profile_add.html:49
-#: canaille/templates/profile_edit.html:23
-#: canaille/templates/profile_settings.html:21
-msgid "Personal information"
-msgstr "Información persoal"
-
-#: canaille/templates/profile_add.html:60
-#: canaille/templates/profile_add.html:71
-#: canaille/templates/profile_edit.html:78
-#: canaille/templates/profile_edit.html:89
-msgid "Click to upload a photo"
-msgstr "Clic para subir foto"
-
-#: canaille/templates/profile_add.html:161
-#: canaille/templates/profile_edit.html:27
-#: canaille/templates/profile_settings.html:25
-#: canaille/templates/profile_settings.html:69
-msgid "Account information"
-msgstr "Información da conta"
-
-#: canaille/templates/profile_add.html:185
-msgid "User password is not mandatory"
-msgstr "O contrasinal non é obrigatorio"
-
-#: canaille/templates/profile_add.html:188
-msgid "The user password can be set:"
-msgstr "O pódese configurar:"
-
-#: canaille/templates/profile_add.html:190
-msgid "by filling this form;"
-msgstr "cubrindo este formulario;"
-
-#: canaille/templates/profile_add.html:191
-msgid ""
-"by sending the user a password initialization mail, after the account "
-"creation;"
-msgstr ""
-"enviando ó usuario un correo de inicialización do contrasinal, despois da "
-"creación da conta;"
-
-#: canaille/templates/profile_add.html:192
-#: canaille/templates/profile_settings.html:109
-msgid ""
-"or simply waiting for the user to sign-in a first time, and then receive a "
-"password initialization mail."
-msgstr ""
-"ou simplemente esperando a que o usuario inicie sesión por primeira vez e "
-"entón recibirá un correo de inicialización do contrasinal."
-
-#: canaille/templates/profile_add.html:197
-#, fuzzy
-#| msgid "The user will not be able to authenticate unless the password is set"
-msgid ""
-"The user will not be able to authenticate unless the password is set, but "
-"they will be able to ask for a password initialization mail."
-msgstr ""
-"O usuario non poderá iniciar sesión a menos que se estableza o contrasinal"
-
-#: canaille/templates/profile_add.html:199
-#, fuzzy
-#| msgid "The user will not be able to authenticate unless the password is set"
-msgid "The user will not be able to authenticate unless the password is set."
-msgstr ""
-"O usuario non poderá iniciar sesión a menos que se estableza o contrasinal"
-
-#: canaille/templates/profile_edit.html:8
-#: canaille/templates/profile_edit.html:52
-#: canaille/templates/profile_settings.html:6
-msgid "My profile"
-msgstr "O meu perfil"
-
-#: canaille/templates/profile_edit.html:10
-#: canaille/templates/profile_edit.html:54
-#: canaille/templates/profile_settings.html:8
-msgid "User profile edition"
-msgstr "Editar perfil de usuario"
-
+#: canaille/templates/profile_add.html:41
 #: canaille/templates/profile_edit.html:41
 #: canaille/templates/profile_settings.html:37
 msgid "This user cannot edit this field"
 msgstr "O usuario non pode editar este campo"
 
+#: canaille/templates/profile_add.html:43
 #: canaille/templates/profile_edit.html:43
 #: canaille/templates/profile_settings.html:39
 msgid "This user cannot see this field"
 msgstr "O usuario non pode ver este campo"
 
-#: canaille/templates/profile_edit.html:60
-msgid "Edit your personal information"
-msgstr "Editar a túa información persoal"
-
-#: canaille/templates/profile_edit.html:62
-msgid "Edit information about a user"
-msgstr "Editar información dun usuario"
-
+#: canaille/templates/profile_add.html:52
 #: canaille/templates/profile_settings.html:48
 msgid "Account deletion"
 msgstr "Eliminar conta"
 
+#: canaille/templates/profile_add.html:57
 #: canaille/templates/profile_settings.html:53
 msgid ""
 "Are you sure you want to delete this user? This action is unrevokable and "
@@ -1026,6 +977,7 @@ msgstr ""
 "Seguro que queres eliminar este usuario? Esta acción non se pode desfacer e "
 "todos os datos deste usuario serán eliminados."
 
+#: canaille/templates/profile_add.html:59
 #: canaille/templates/profile_settings.html:55
 msgid ""
 "Are you sure you want to delete your account? This action is unrevokable and "
@@ -1034,46 +986,177 @@ msgstr ""
 "Seguro que queres eliminar este usuario? Esta acción non se pode desfacer e "
 "todos os datos deste usuario serán eliminados."
 
-#: canaille/templates/profile_settings.html:98
+#: canaille/templates/profile_add.html:76
+#: canaille/templates/profile_edit.html:8
+#: canaille/templates/profile_edit.html:52
+#: canaille/templates/profile_settings.html:6
+msgid "My profile"
+msgstr "O meu perfil"
+
+#: canaille/templates/profile_add.html:78
+#: canaille/templates/profile_edit.html:10
+#: canaille/templates/profile_edit.html:54
+#: canaille/templates/profile_settings.html:8
+msgid "User profile edition"
+msgstr "Editar perfil de usuario"
+
+#: canaille/templates/profile_add.html:84
+msgid "Create a new user account"
+msgstr "Crear nova conta de usuario"
+
+#: canaille/templates/profile_add.html:86
+#: canaille/templates/profile_edit.html:60
+msgid "Edit your personal information"
+msgstr "Editar a túa información persoal"
+
+#: canaille/templates/profile_add.html:88
+#: canaille/templates/profile_edit.html:62
+msgid "Edit information about a user"
+msgstr "Editar información dun usuario"
+
+#: canaille/templates/profile_add.html:94
+#: canaille/templates/profile_edit.html:23
+#: canaille/templates/profile_settings.html:21
+msgid "Personal information"
+msgstr "Información persoal"
+
+#: canaille/templates/profile_add.html:106
+#: canaille/templates/profile_add.html:117
+#: canaille/templates/profile_edit.html:78
+#: canaille/templates/profile_edit.html:89
+msgid "Click to upload a photo"
+msgstr "Clic para subir foto"
+
+#: canaille/templates/profile_add.html:206
+#: canaille/templates/profile_edit.html:27
+#: canaille/templates/profile_settings.html:25
+#: canaille/templates/profile_settings.html:91
+msgid "Account information"
+msgstr "Información da conta"
+
+#: canaille/templates/profile_add.html:230
+msgid "User password is not mandatory"
+msgstr "O contrasinal non é obrigatorio"
+
+#: canaille/templates/profile_add.html:233
+msgid "The user password can be set:"
+msgstr "O pódese configurar:"
+
+#: canaille/templates/profile_add.html:235
+msgid "by filling this form;"
+msgstr "cubrindo este formulario;"
+
+#: canaille/templates/profile_add.html:236
+msgid ""
+"by sending the user a password initialization mail, after the account "
+"creation;"
+msgstr ""
+"enviando ó usuario un correo de inicialización do contrasinal, despois da "
+"creación da conta;"
+
+#: canaille/templates/profile_add.html:237
+#: canaille/templates/profile_settings.html:135
+msgid ""
+"or simply waiting for the user to sign-in a first time, and then receive a "
+"password initialization mail."
+msgstr ""
+"ou simplemente esperando a que o usuario inicie sesión por primeira vez e "
+"entón recibirá un correo de inicialización do contrasinal."
+
+#: canaille/templates/profile_add.html:242
+#, fuzzy
+#| msgid "The user will not be able to authenticate unless the password is set"
+msgid ""
+"The user will not be able to authenticate unless the password is set, but "
+"they will be able to ask for a password initialization mail."
+msgstr ""
+"O usuario non poderá iniciar sesión a menos que se estableza o contrasinal"
+
+#: canaille/templates/profile_add.html:244
+#, fuzzy
+#| msgid "The user will not be able to authenticate unless the password is set"
+msgid "The user will not be able to authenticate unless the password is set."
+msgstr ""
+"O usuario non poderá iniciar sesión a menos que se estableza o contrasinal"
+
+#: canaille/templates/profile_add.html:255
+#: canaille/templates/profile_settings.html:199
+msgid "Submit"
+msgstr "Enviar"
+
+#: canaille/templates/profile_settings.html:70
+#, fuzzy
+#| msgid "Account deletion"
+msgid "Account locking"
+msgstr "Eliminar conta"
+
+#: canaille/templates/profile_settings.html:75
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to revoke this token? This action is unrevokable."
+msgid ""
+"Are you sure you want to lock this account? The user won't be able to login "
+"until their account is unlocked."
+msgstr ""
+"Estás seguro de que queres revogar este token? Esta acción non pode ser "
+"desfeita."
+
+#: canaille/templates/profile_settings.html:77
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to delete your account? This action is unrevokable "
+#| "and all your data will be removed forever."
+msgid ""
+"Are you sure you want to lock your account? You won't be abel to login until "
+"your account is unlocked."
+msgstr ""
+"Seguro que queres eliminar este usuario? Esta acción non se pode desfacer e "
+"todos os datos deste usuario serán eliminados."
+
+#: canaille/templates/profile_settings.html:83
+msgid "Lock"
+msgstr ""
+
+#: canaille/templates/profile_settings.html:124
 msgid "Send email"
 msgstr "Enviar email"
 
-#: canaille/templates/profile_settings.html:102
+#: canaille/templates/profile_settings.html:128
 msgid "This user does not have a password yet"
 msgstr "Este usuario aínda non ten contrasinal"
 
-#: canaille/templates/profile_settings.html:105
+#: canaille/templates/profile_settings.html:131
 msgid "You can solve this by:"
 msgstr "Para solucionalo:"
 
-#: canaille/templates/profile_settings.html:107
+#: canaille/templates/profile_settings.html:133
 msgid "setting a password using this form;"
 msgstr "establece un contrasinal usando este formulario;"
 
-#: canaille/templates/profile_settings.html:108
+#: canaille/templates/profile_settings.html:134
 msgid ""
 "sending the user a password initialization mail, by clicking this button;"
 msgstr ""
 "envía un email de inicialización de contrasinal ó usuario premendo neste "
 "botón;"
 
-#: canaille/templates/profile_settings.html:112
+#: canaille/templates/profile_settings.html:138
 msgid "The user will not be able to authenticate unless the password is set"
 msgstr ""
 "O usuario non poderá iniciar sesión a menos que se estableza o contrasinal"
 
-#: canaille/templates/profile_settings.html:120
+#: canaille/templates/profile_settings.html:146
 msgid "Send mail"
 msgstr "Enviar email"
 
 #: canaille/templates/mail/admin.html:97
-#: canaille/templates/profile_settings.html:123
+#: canaille/templates/profile_settings.html:149
 #: canaille/templates/reset-password.html:11
 #: canaille/templates/reset-password.html:16
 msgid "Password reset"
 msgstr "Restablecer contrasinal"
 
-#: canaille/templates/profile_settings.html:125
+#: canaille/templates/profile_settings.html:151
 msgid ""
 "If the user has forgotten his password, you can send him a password reset "
 "email by clicking this button."
@@ -1081,15 +1164,38 @@ msgstr ""
 "Se o usuario esqueceu o seu contrasinal, podes enviarlle un correo "
 "electrónico para restablecer o contrasinal premendo neste botón."
 
-#: canaille/templates/profile_settings.html:137
+#: canaille/templates/profile_settings.html:160
+msgid "Unlock"
+msgstr ""
+
+#: canaille/templates/profile_settings.html:163
+#, fuzzy
+#| msgid "This user cannot see this field"
+msgid "This user account is locked"
+msgstr "O usuario non pode ver este campo"
+
+#: canaille/templates/profile_settings.html:166
+#, fuzzy
+#| msgid "The user will not be able to authenticate unless the password is set"
+msgid "The user won't be able to connect until their account is unlocked."
+msgstr ""
+"O usuario non poderá iniciar sesión a menos que se estableza o contrasinal"
+
+#: canaille/templates/profile_settings.html:178
+#, fuzzy
+#| msgid "Delete my account"
+msgid "Lock the account"
+msgstr "Eliminar a miña conta"
+
+#: canaille/templates/profile_settings.html:185
 msgid "Delete the user"
 msgstr "Eliminar usuario"
 
-#: canaille/templates/profile_settings.html:139
+#: canaille/templates/profile_settings.html:187
 msgid "Delete my account"
 msgstr "Eliminar a miña conta"
 
-#: canaille/templates/profile_settings.html:146
+#: canaille/templates/profile_settings.html:194
 msgid "Impersonate"
 msgstr "Suplantar"
 
@@ -1098,14 +1204,14 @@ msgstr "Suplantar"
 msgid "Users"
 msgstr "Usuarios"
 
-#: canaille/templates/macro/form.html:67
+#: canaille/templates/macro/form.html:60
 #: canaille/templates/oidc/admin/client_edit.html:63
 #: canaille/templates/oidc/admin/client_edit.html:72
 #: canaille/templates/oidc/admin/client_edit.html:81
 msgid "This field is not editable"
 msgstr "Este campo non é editable"
 
-#: canaille/templates/macro/form.html:71
+#: canaille/templates/macro/form.html:64
 msgid "This field is required"
 msgstr "Este campo é obrigatorio"
 
@@ -1129,7 +1235,7 @@ msgstr ""
 
 #: canaille/templates/mail/admin.html:5 canaille/templates/mail/admin.html:12
 #: canaille/templates/oidc/admin/authorization_list.html:16
-#: canaille/templates/oidc/admin/authorization_view.html:12
+#: canaille/templates/oidc/admin/authorization_view.html:11
 #: canaille/templates/oidc/admin/client_add.html:12
 #: canaille/templates/oidc/admin/client_edit.html:16
 #: canaille/templates/oidc/admin/client_list.html:16
@@ -1140,7 +1246,7 @@ msgstr "Emails"
 
 #: canaille/templates/mail/admin.html:16
 #: canaille/templates/oidc/admin/authorization_list.html:20
-#: canaille/templates/oidc/admin/authorization_view.html:16
+#: canaille/templates/oidc/admin/authorization_view.html:15
 #: canaille/templates/oidc/admin/client_add.html:16
 #: canaille/templates/oidc/admin/client_edit.html:20
 #: canaille/templates/oidc/admin/client_list.html:5
@@ -1153,7 +1259,7 @@ msgstr "Clientes"
 
 #: canaille/templates/mail/admin.html:20
 #: canaille/templates/oidc/admin/authorization_list.html:24
-#: canaille/templates/oidc/admin/authorization_view.html:20
+#: canaille/templates/oidc/admin/authorization_view.html:19
 #: canaille/templates/oidc/admin/client_add.html:5
 #: canaille/templates/oidc/admin/client_add.html:20
 #: canaille/templates/oidc/admin/client_add.html:36
@@ -1166,7 +1272,7 @@ msgstr "Engadir un cliente"
 
 #: canaille/templates/mail/admin.html:24
 #: canaille/templates/oidc/admin/authorization_list.html:28
-#: canaille/templates/oidc/admin/authorization_view.html:24
+#: canaille/templates/oidc/admin/authorization_view.html:23
 #: canaille/templates/oidc/admin/client_add.html:24
 #: canaille/templates/oidc/admin/client_edit.html:28
 #: canaille/templates/oidc/admin/client_list.html:28
@@ -1181,7 +1287,7 @@ msgstr "Tokens"
 #: canaille/templates/oidc/admin/authorization_list.html:5
 #: canaille/templates/oidc/admin/authorization_list.html:32
 #: canaille/templates/oidc/admin/authorization_list.html:41
-#: canaille/templates/oidc/admin/authorization_view.html:28
+#: canaille/templates/oidc/admin/authorization_view.html:27
 #: canaille/templates/oidc/admin/client_add.html:28
 #: canaille/templates/oidc/admin/client_edit.html:32
 #: canaille/templates/oidc/admin/client_list.html:32
@@ -1326,14 +1432,16 @@ msgstr ""
 "Este correo electrónico é unha proba para comprobar que recibes "
 "comunicacións desde %(site_name)s."
 
-#: canaille/templates/oidc/admin/authorization_view.html:5
-#: canaille/templates/oidc/admin/authorization_view.html:36
+#: canaille/templates/oidc/admin/authorization_view.html:4
+#: canaille/templates/oidc/admin/authorization_view.html:35
 msgid "View an authorization"
 msgstr "Ver unha autorización"
 
 #: canaille/templates/oidc/admin/client_add.html:39
-msgid "Confirm"
-msgstr "Confirmar"
+#, fuzzy
+#| msgid "Created"
+msgid "Create"
+msgstr "Creado"
 
 #: canaille/templates/oidc/admin/client_edit.html:5
 #: canaille/templates/oidc/admin/client_edit.html:54
@@ -1368,10 +1476,6 @@ msgstr "Emitido en"
 msgid "Delete the client"
 msgstr "Eliminar o cliente"
 
-#: canaille/templates/oidc/admin/client_edit.html:98
-msgid "Edit"
-msgstr "Editar"
-
 #: canaille/templates/oidc/admin/token_view.html:5
 #: canaille/templates/oidc/admin/token_view.html:57
 msgid "Token details"
@@ -1467,7 +1571,7 @@ msgstr "Os meus consentimentos"
 
 #: canaille/templates/oidc/user/consent_list.html:20
 #: canaille/templates/oidc/user/preconsent_list.html:20
-#: canaille/templates/oidc/user/preconsent_list.html:31
+#: canaille/templates/oidc/user/preconsent_list.html:30
 msgid "Pre-authorized applications"
 msgstr "Aplicacións preautorizadas"
 
@@ -1488,17 +1592,17 @@ msgid "Had access to:"
 msgstr "Tiña acceso a:"
 
 #: canaille/templates/oidc/user/consent_list.html:61
-#: canaille/templates/oidc/user/preconsent_list.html:51
+#: canaille/templates/oidc/user/preconsent_list.html:52
 msgid "Has access to:"
 msgstr "Ten acceso a:"
 
 #: canaille/templates/oidc/user/consent_list.html:84
-#: canaille/templates/oidc/user/preconsent_list.html:73
+#: canaille/templates/oidc/user/preconsent_list.html:74
 msgid "Policy"
 msgstr "Política"
 
 #: canaille/templates/oidc/user/consent_list.html:92
-#: canaille/templates/oidc/user/preconsent_list.html:81
+#: canaille/templates/oidc/user/preconsent_list.html:82
 msgid "Terms of service"
 msgstr "Condicións do servizo"
 
@@ -1507,7 +1611,7 @@ msgid "Restore access"
 msgstr "Restaurar acceso"
 
 #: canaille/templates/oidc/user/consent_list.html:104
-#: canaille/templates/oidc/user/preconsent_list.html:87
+#: canaille/templates/oidc/user/preconsent_list.html:88
 msgid "Revoke access"
 msgstr "Revogar acceso"
 
@@ -1542,13 +1646,23 @@ msgstr "Permanecer rexistrado"
 msgid "Logout"
 msgstr "Pechar sesión"
 
-#: canaille/templates/oidc/user/preconsent_list.html:34
+#: canaille/templates/oidc/user/preconsent_list.html:33
 msgid ""
 "Those applications automatically have authorizations to access you data."
 msgstr ""
 "Esas aplicacións teñen automaticamente autorización para acceder ós teus "
 "datos."
 
+#: canaille/templates/oidc/user/preconsent_list.html:97
+#: canaille/templates/partial/groups.html:36
+#: canaille/templates/partial/oidc/admin/authorization_list.html:36
+#: canaille/templates/partial/oidc/admin/client_list.html:40
+#: canaille/templates/partial/oidc/admin/token_list.html:44
+#: canaille/templates/partial/users.html:70
+#, fuzzy
+msgid "There is nothing here"
+msgstr "O acceso non está revogado"
+
 #: canaille/templates/partial/groups.html:8
 msgid "Number of members"
 msgstr "Número de membros"
@@ -1557,7 +1671,7 @@ msgstr "Número de membros"
 #: canaille/templates/partial/oidc/admin/authorization_list.html:31
 #: canaille/templates/partial/oidc/admin/client_list.html:35
 #: canaille/templates/partial/oidc/admin/token_list.html:39
-#: canaille/templates/partial/users.html:63
+#: canaille/templates/partial/users.html:65
 msgid "No item matches your request"
 msgstr ""
 
@@ -1565,18 +1679,13 @@ msgstr ""
 #: canaille/templates/partial/oidc/admin/authorization_list.html:33
 #: canaille/templates/partial/oidc/admin/client_list.html:37
 #: canaille/templates/partial/oidc/admin/token_list.html:41
-#: canaille/templates/partial/users.html:65
+#: canaille/templates/partial/users.html:67
 msgid "Maybe try with different criterias?"
 msgstr ""
 
-#: canaille/templates/partial/groups.html:36
-#: canaille/templates/partial/oidc/admin/authorization_list.html:36
-#: canaille/templates/partial/oidc/admin/client_list.html:40
-#: canaille/templates/partial/oidc/admin/token_list.html:44
-#: canaille/templates/partial/users.html:68
-#, fuzzy
-msgid "There is nothing here"
-msgstr "O acceso non está revogado"
+#: canaille/templates/partial/users.html:29
+msgid "This account is locked"
+msgstr ""
 
 #: canaille/templates/partial/oidc/admin/authorization_list.html:5
 msgid "Code"
@@ -1618,6 +1727,9 @@ msgstr "Os meus consentimentos"
 msgid "Admin"
 msgstr "Audiencia"
 
+#~ msgid "Confirm"
+#~ msgstr "Confirmar"
+
 #, fuzzy
 #~ msgid "Employee number"
 #~ msgstr "Número de teléfono"
diff --git a/canaille/translations/nb_NO/LC_MESSAGES/messages.po b/canaille/translations/nb_NO/LC_MESSAGES/messages.po
index 1f9045b4..6b16f896 100644
--- a/canaille/translations/nb_NO/LC_MESSAGES/messages.po
+++ b/canaille/translations/nb_NO/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-03-29 23:00+0200\n"
+"POT-Creation-Date: 2023-05-26 15:31+0200\n"
 "PO-Revision-Date: 2023-03-24 22:36+0000\n"
 "Last-Translator: Sofi <sofi+git@mailbox.org>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/"
@@ -20,89 +20,138 @@ msgstr ""
 "X-Generator: Weblate 4.17-dev\n"
 "Generated-By: Babel 2.12.1\n"
 
-#: canaille/account.py:105 canaille/account.py:130
-#: canaille/oidc/endpoints.py:84
+#: canaille/app/flask.py:65
+msgid "No SMTP server has been configured"
+msgstr "Ingen SMTP-tjener er satt opp"
+
+#: canaille/app/forms.py:20
+msgid "This is not a valid URL"
+msgstr ""
+
+#: canaille/app/forms.py:83
+#, fuzzy
+msgid "The page number is not valid"
+msgstr "Tilgangen har blitt tilbakekalt"
+
+#: canaille/backends/ldap/backend.py:98
+msgid "Could not connect to the LDAP server '{uri}'"
+msgstr "Kunne ikke koble til LDAP-tjeneren «{uri}»"
+
+#: canaille/backends/ldap/backend.py:114
+msgid "LDAP authentication failed with user '{user}'"
+msgstr ""
+
+#: canaille/backends/ldap/backend.py:214
+msgid "John Doe"
+msgstr "Ola Nordmann"
+
+#: canaille/backends/ldap/backend.py:217 canaille/core/forms.py:124
+#: canaille/core/forms.py:340
+msgid "jdoe"
+msgstr "onord"
+
+#: canaille/backends/ldap/backend.py:220
+msgid "john@doe.com"
+msgstr "ola@nordmann.no"
+
+#: canaille/backends/ldap/backend.py:222
+msgid " or "
+msgstr " eller "
+
+#: canaille/backends/ldap/models.py:121
+#, fuzzy
+#| msgid "Your account has already been created."
+msgid "Your account has been locked."
+msgstr "Kontoen din har allerede blitt opprettet."
+
+#: canaille/backends/ldap/models.py:126
+msgid "You should change your password."
+msgstr ""
+
+#: canaille/core/account.py:97 canaille/core/account.py:120
+#: canaille/core/account.py:128 canaille/oidc/endpoints.py:81
+#: canaille/oidc/endpoints.py:87
 #, fuzzy
 msgid "Login failed, please check your information"
 msgstr "Kunne ikke logge inn. Sjekk at alt er riktig."
 
-#: canaille/account.py:136 canaille/account.py:621
+#: canaille/core/account.py:136 canaille/core/account.py:667
 #, fuzzy, python-format
 msgid "Connection successful. Welcome %(user)s"
 msgstr "Velkommen %(user)s"
 
-#: canaille/account.py:149
+#: canaille/core/account.py:151
 #, python-format
 msgid "You have been disconnected. See you next time %(user)s"
 msgstr "Du har blitt frakoblet. På gjensyn %(user)s"
 
-#: canaille/account.py:169
+#: canaille/core/account.py:175
 msgid ""
 "A password initialization link has been sent at your email address. You "
 "should receive it within a few minutes."
 msgstr "Lenke for oppsett av passord sendt til din e-postadresse."
 
-#: canaille/account.py:175 canaille/account.py:524
+#: canaille/core/account.py:181 canaille/core/account.py:537
 #, fuzzy
 msgid "Could not send the password initialization email"
 msgstr "Kunne ikke sende e-post for oppsett av passord"
 
-#: canaille/account.py:267 canaille/account.py:295
+#: canaille/core/account.py:275 canaille/core/account.py:303
 msgid "The invitation link that brought you here was invalid."
 msgstr "Invitasjonslenken som tok deg hit er ikke gyldig."
 
-#: canaille/account.py:274
+#: canaille/core/account.py:282
 msgid "The invitation link that brought you here has expired."
 msgstr "Invitasjonslenken som tok deg hit har utløpt."
 
-#: canaille/account.py:281
+#: canaille/core/account.py:289
 msgid "Your account has already been created."
 msgstr "Kontoen din har allerede blitt opprettet."
 
-#: canaille/account.py:288
+#: canaille/core/account.py:296
 #, fuzzy
 msgid "You are already logged in, you cannot create an account."
 msgstr "Du er allerede innlogget. Du kan ikke opprette konto."
 
-#: canaille/account.py:307 canaille/forms.py:289 canaille/forms.py:370
-#: canaille/templates/groups.html:5 canaille/templates/groups.html:25
-#: canaille/templates/partial/users.html:18
+#: canaille/core/account.py:319 canaille/core/forms.py:263
+#: canaille/core/forms.py:358 canaille/templates/groups.html:5
+#: canaille/templates/groups.html:25 canaille/templates/partial/users.html:18
 #: canaille/themes/default/base.html:61
 msgid "Groups"
 msgstr "Grupper"
 
-#: canaille/account.py:329 canaille/account.py:358
+#: canaille/core/account.py:341 canaille/core/account.py:372
 #, fuzzy
 msgid "User account creation failed."
 msgstr "Kunne ikke opprette brukerkonto."
 
-#: canaille/account.py:334
+#: canaille/core/account.py:346
 #, fuzzy
 msgid "Your account has been created successfuly."
 msgstr "Kontoen din ble opprettet."
 
-#: canaille/account.py:399
+#: canaille/core/account.py:412
 #, fuzzy
 msgid "User account creation succeed."
 msgstr "Brukerkonto opprettet."
 
-#: canaille/account.py:460 canaille/account.py:567
+#: canaille/core/account.py:472 canaille/core/account.py:602
 #, fuzzy
 msgid "Profile edition failed."
 msgstr "Kunne ikke redigere profil."
 
-#: canaille/account.py:486 canaille/account.py:582
+#: canaille/core/account.py:495 canaille/core/account.py:624
 msgid "Profile updated successfuly."
 msgstr "Profil redigert."
 
-#: canaille/account.py:518
+#: canaille/core/account.py:531
 #, fuzzy
 msgid ""
 "A password initialization link has been sent at the user email address. It "
 "should be received within a few minutes."
 msgstr "Lenke for oppsett av passord sendt til din e-postadresse."
 
-#: canaille/account.py:531
+#: canaille/core/account.py:544
 #, fuzzy
 msgid ""
 "A password reset link has been sent at the user email address. It should be "
@@ -111,27 +160,39 @@ msgstr ""
 "Lenke for tilbakestilling av passord sendt til brukerens e-postadresse. Den "
 "bør være mottatt i løpet av et par minutter."
 
-#: canaille/account.py:537
+#: canaille/core/account.py:550
 msgid "Could not send the password reset email"
 msgstr "Kunne ikke sende e-post for tilbakestilling av passord"
 
-#: canaille/account.py:602
+#: canaille/core/account.py:559
+#, fuzzy
+#| msgid "The access has been revoked"
+msgid "The account has been locked"
+msgstr "Tilgangen har blitt tilbakekalt"
+
+#: canaille/core/account.py:570
+#, fuzzy
+#| msgid "The access has been revoked"
+msgid "The account has been unlocked"
+msgstr "Tilgangen har blitt tilbakekalt"
+
+#: canaille/core/account.py:644
 #, python-format
 msgid "The user %(user)s has been sucessfuly deleted"
 msgstr "Brukeren %(user)s ble slettet"
 
-#: canaille/account.py:636
+#: canaille/core/account.py:684
 msgid "Could not send the password reset link."
 msgstr "Kunne ikke sende lenke for passordgjenoppretting."
 
-#: canaille/account.py:640
+#: canaille/core/account.py:688
 #, fuzzy
 msgid ""
 "A password reset link has been sent at your email address. You should "
 "receive it within a few minutes."
 msgstr "Lenke for tilbakestilling av passord sendt til din e-postadresse."
 
-#: canaille/account.py:651
+#: canaille/core/account.py:699
 #, fuzzy, python-format
 msgid ""
 "The user '%(user)s' does not have permissions to update their password. We "
@@ -140,382 +201,354 @@ msgstr ""
 "Brukeren «%(user)s» har ikke tilgang til å oppdatere passordet sitt. Kan "
 "ikke sende e-post om tilbakestilling av passord."
 
-#: canaille/account.py:666
+#: canaille/core/account.py:714
 #, fuzzy
 msgid "We encountered an issue while we sent the password recovery email."
 msgstr "Kunne ikke sende e-post for gjenoppretting av passord."
 
-#: canaille/account.py:685
+#: canaille/core/account.py:735
 msgid "The password reset link that brought you here was invalid."
 msgstr "Passordtilbakestillingslenken som tok deg hit er ikke gyldig."
 
-#: canaille/account.py:694
+#: canaille/core/account.py:744
 #, fuzzy
 msgid "Your password has been updated successfuly"
 msgstr "Passordet ditt er oppdatert."
 
-#: canaille/admin.py:23 canaille/templates/partial/users.html:15
+#: canaille/core/admin.py:23 canaille/templates/partial/users.html:15
 #, fuzzy
 msgid "Email"
 msgstr "E-postadresse"
 
-#: canaille/admin.py:29 canaille/forms.py:85 canaille/forms.py:109
-#: canaille/forms.py:197 canaille/forms.py:364
+#: canaille/core/admin.py:29 canaille/core/forms.py:56
+#: canaille/core/forms.py:80 canaille/core/forms.py:168
+#: canaille/core/forms.py:352
 msgid "jane@doe.com"
 msgstr "ola@nordmann.no"
 
-#: canaille/admin.py:42
+#: canaille/core/admin.py:42
 #, fuzzy
 msgid "The test invitation mail has been sent correctly"
 msgstr "Test-invitasjon sendt per e-post"
 
-#: canaille/admin.py:44
+#: canaille/core/admin.py:44
 #, fuzzy
 msgid "The test invitation mail has not been sent correctly"
 msgstr "Test-invitasjonen per e-post ble ikke sendt"
 
-#: canaille/admin.py:89 canaille/mails.py:187
+#: canaille/core/admin.py:89 canaille/core/mails.py:92
 #, fuzzy
 msgid "Password initialization on {website_name}"
 msgstr "Oppsett av passord på {website_name}"
 
-#: canaille/admin.py:131 canaille/mails.py:147
+#: canaille/core/admin.py:131 canaille/core/mails.py:52
 msgid "Password reset on {website_name}"
 msgstr "Passord tilbakestilt på {website_name}"
 
-#: canaille/admin.py:173
+#: canaille/core/admin.py:173
 msgid "Invitation on {website_name}"
 msgstr "Invitasjon på {website_name}"
 
-#: canaille/apputils.py:32
-msgid "John Doe"
-msgstr "Ola Nordmann"
-
-#: canaille/apputils.py:35 canaille/forms.py:153 canaille/forms.py:352
-msgid "jdoe"
-msgstr "onord"
-
-#: canaille/apputils.py:38
-msgid "john@doe.com"
-msgstr "ola@nordmann.no"
-
-#: canaille/apputils.py:40
-msgid " or "
-msgstr " eller "
-
-#: canaille/flaskutils.py:63
-msgid "No SMTP server has been configured"
-msgstr "Ingen SMTP-tjener er satt opp"
-
-#: canaille/forms.py:19
-msgid "This is not a valid URL"
-msgstr ""
-
-#: canaille/forms.py:27
+#: canaille/core/forms.py:22
 msgid "The login '{login}' already exists"
 msgstr "Innloggingen «{login}» finnes allerede"
 
-#: canaille/forms.py:36
+#: canaille/core/forms.py:31
 #, fuzzy
 #| msgid "The email '{email}' already exists"
 msgid "The email '{email}' is already used"
 msgstr "E-postadressen «{email}» finnes allerede"
 
-#: canaille/forms.py:43
+#: canaille/core/forms.py:38
 msgid "The group '{group}' already exists"
 msgstr "Gruppen «{group}» finnes allerede"
 
-#: canaille/forms.py:52
+#: canaille/core/forms.py:47
 msgid "The login '{login}' does not exist"
 msgstr "Innloggingen «{login}» finnes ikke"
 
-#: canaille/forms.py:77
-#, fuzzy
-msgid "The page number is not valid"
-msgstr "Tilgangen har blitt tilbakekalt"
-
-#: canaille/forms.py:82 canaille/forms.py:106
+#: canaille/core/forms.py:53 canaille/core/forms.py:77
 #: canaille/templates/partial/users.html:9
 #, fuzzy
 msgid "Login"
 msgstr "Logg inn"
 
-#: canaille/forms.py:95 canaille/forms.py:118 canaille/forms.py:242
+#: canaille/core/forms.py:66 canaille/core/forms.py:89
+#: canaille/core/forms.py:213
 msgid "Password"
 msgstr "Passord"
 
-#: canaille/forms.py:125 canaille/forms.py:249
+#: canaille/core/forms.py:96 canaille/core/forms.py:223
 msgid "Password confirmation"
 msgstr "Passordbekreftelse"
 
-#: canaille/forms.py:128 canaille/forms.py:252
+#: canaille/core/forms.py:99 canaille/core/forms.py:226
 msgid "Password and confirmation do not match."
 msgstr "Passordet og bekreftelsen samsvarer ikke."
 
-#: canaille/forms.py:147
+#: canaille/core/forms.py:118
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: canaille/forms.py:152 canaille/forms.py:351
+#: canaille/core/forms.py:123 canaille/core/forms.py:339
 msgid "Username"
 msgstr "Brukernavn"
 
-#: canaille/forms.py:156 canaille/forms.py:323 canaille/forms.py:337
-#: canaille/oidc/forms.py:22 canaille/templates/partial/groups.html:6
+#: canaille/core/forms.py:127 canaille/core/forms.py:311
+#: canaille/core/forms.py:325 canaille/oidc/forms.py:22
+#: canaille/templates/partial/groups.html:6
 #: canaille/templates/partial/oidc/admin/client_list.html:6
 #: canaille/templates/partial/users.html:12
 msgid "Name"
 msgstr "Navn"
 
-#: canaille/forms.py:158
+#: canaille/core/forms.py:129
 msgid "Title"
 msgstr "Tittel"
 
-#: canaille/forms.py:158
+#: canaille/core/forms.py:129
 msgid "Vice president"
 msgstr "Visepresident"
 
-#: canaille/forms.py:161
+#: canaille/core/forms.py:132
 msgid "Given name"
 msgstr "Fornavn"
 
-#: canaille/forms.py:163
+#: canaille/core/forms.py:134
 msgid "John"
 msgstr "Ola"
 
-#: canaille/forms.py:169
+#: canaille/core/forms.py:140
 msgid "Family Name"
 msgstr "Etternavn"
 
-#: canaille/forms.py:172
+#: canaille/core/forms.py:143
 msgid "Doe"
 msgstr "Nordmann"
 
-#: canaille/forms.py:178
+#: canaille/core/forms.py:149
 msgid "Display Name"
 msgstr "Visningsnavn"
 
-#: canaille/forms.py:181
+#: canaille/core/forms.py:152
 msgid "Johnny"
 msgstr "Ola"
 
-#: canaille/forms.py:187 canaille/forms.py:357
+#: canaille/core/forms.py:158 canaille/core/forms.py:345
 msgid "Email address"
 msgstr "E-postadresse"
 
-#: canaille/forms.py:193
+#: canaille/core/forms.py:164
 msgid ""
 "This email will be used as a recovery address to reset the password if needed"
 msgstr ""
 
-#: canaille/forms.py:203
+#: canaille/core/forms.py:174
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: canaille/forms.py:203
+#: canaille/core/forms.py:174
 msgid "555-000-555"
 msgstr "87 65 43 21"
 
-#: canaille/forms.py:206
+#: canaille/core/forms.py:177
 msgid "Address"
 msgstr "Adresse"
 
-#: canaille/forms.py:208
+#: canaille/core/forms.py:179
 msgid "132, Foobar Street, Gotham City 12401, XX"
 msgstr ""
 
-#: canaille/forms.py:212
+#: canaille/core/forms.py:183
 #, fuzzy
 msgid "Street"
 msgstr "Hemmelighet"
 
-#: canaille/forms.py:214
+#: canaille/core/forms.py:185
 msgid "132, Foobar Street"
 msgstr ""
 
-#: canaille/forms.py:218
+#: canaille/core/forms.py:189
 msgid "Postal Code"
 msgstr "Postnummer"
 
-#: canaille/forms.py:224
+#: canaille/core/forms.py:195
 msgid "Locality"
 msgstr "Kommune"
 
-#: canaille/forms.py:226
+#: canaille/core/forms.py:197
 msgid "Gotham City"
 msgstr ""
 
-#: canaille/forms.py:230
+#: canaille/core/forms.py:201
 msgid "Region"
 msgstr ""
 
-#: canaille/forms.py:232
+#: canaille/core/forms.py:203
 msgid "North Pole"
 msgstr ""
 
-#: canaille/forms.py:236
+#: canaille/core/forms.py:207
 msgid "Photo"
 msgstr "Bilde"
 
-#: canaille/forms.py:240 canaille/templates/profile_add.html:63
+#: canaille/core/forms.py:211 canaille/templates/profile_add.html:109
 #: canaille/templates/profile_edit.html:81
 msgid "Delete the photo"
 msgstr "Slett bildet"
 
-#: canaille/forms.py:260
+#: canaille/core/forms.py:234
 #, fuzzy
 #| msgid "Username"
 msgid "User number"
 msgstr "Brukernavn"
 
-#: canaille/forms.py:262 canaille/forms.py:268
+#: canaille/core/forms.py:236 canaille/core/forms.py:242
 msgid "1234"
 msgstr "1234"
 
-#: canaille/forms.py:266
+#: canaille/core/forms.py:240
 #, fuzzy
-msgid "Department number"
+msgid "Department"
 msgstr "Telefonnummer"
 
-#: canaille/forms.py:272
+#: canaille/core/forms.py:246
 #, fuzzy
 #| msgid "Invitation"
 msgid "Organization"
 msgstr "Invitasjon"
 
-#: canaille/forms.py:274
+#: canaille/core/forms.py:248
 msgid "Cogip LTD."
 msgstr ""
 
-#: canaille/forms.py:278
+#: canaille/core/forms.py:252
 msgid "Website"
 msgstr "Nettside"
 
-#: canaille/forms.py:280
+#: canaille/core/forms.py:254
 msgid "https://mywebsite.tld"
 msgstr ""
 
-#: canaille/forms.py:285
+#: canaille/core/forms.py:259
 msgid "Preferred language"
 msgstr "Foretrukket språk"
 
-#: canaille/forms.py:291
+#: canaille/core/forms.py:267
 #, fuzzy
 msgid "users, admins …"
 msgstr "brukere, administratorer …"
 
-#: canaille/forms.py:326
+#: canaille/core/forms.py:289
+#, fuzzy
+#| msgid "Account creation"
+msgid "Account expiration"
+msgstr "Kontoopprettelse"
+
+#: canaille/core/forms.py:314
 msgid "group"
 msgstr "gruppe"
 
-#: canaille/forms.py:330 canaille/forms.py:344
+#: canaille/core/forms.py:318 canaille/core/forms.py:332
 #: canaille/templates/partial/groups.html:7
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: canaille/forms.py:355
+#: canaille/core/forms.py:343
 msgid "Username editable by the invitee"
 msgstr ""
 
-#: canaille/groups.py:38
+#: canaille/core/groups.py:37
 #, fuzzy
 msgid "Group creation failed."
 msgstr "Kunne ikke opprette gruppe."
 
-#: canaille/groups.py:46
+#: canaille/core/groups.py:45
 #, fuzzy, python-format
 msgid "The group %(group)s has been sucessfully created"
 msgstr "Gruppen «%(group)s» ble opprettet"
 
-#: canaille/groups.py:98
+#: canaille/core/groups.py:97
 #, fuzzy, python-format
 msgid "The group %(group)s has been sucessfully edited."
 msgstr "Gruppen «%(group)s» ble redigert."
 
-#: canaille/groups.py:106
+#: canaille/core/groups.py:105
 #, fuzzy
 msgid "Group edition failed."
 msgstr "Kunne ikke redigere gruppe."
 
-#: canaille/groups.py:120
+#: canaille/core/groups.py:119
 #, fuzzy, python-format
 msgid "The group %(group)s has been sucessfully deleted"
 msgstr "Gruppen «%(group)s» har blitt slettet"
 
-#: canaille/mails.py:109
+#: canaille/core/mails.py:14
 msgid "Test email from {website_name}"
 msgstr "Test per e-post fra {website_name}"
 
-#: canaille/mails.py:217
+#: canaille/core/mails.py:122
 msgid "You have been invited to create an account on {website_name}"
 msgstr "Du har blitt invitert til å opprette en konto på {website_name}"
 
-#: canaille/ldap_backend/backend.py:61
-msgid "Could not connect to the LDAP server '{uri}'"
-msgstr "Kunne ikke koble til LDAP-tjeneren «{uri}»"
-
-#: canaille/ldap_backend/backend.py:77
-msgid "LDAP authentication failed with user '{user}'"
-msgstr ""
-
-#: canaille/oidc/clients.py:46
+#: canaille/oidc/clients.py:47
 msgid "The client has not been added. Please check your information."
 msgstr ""
 
-#: canaille/oidc/clients.py:82
+#: canaille/oidc/clients.py:83
 msgid "The client has been created."
 msgstr "Klienten har blitt opprettet."
 
-#: canaille/oidc/clients.py:126
+#: canaille/oidc/clients.py:131
 msgid "The client has not been edited. Please check your information."
 msgstr ""
 
-#: canaille/oidc/clients.py:155
+#: canaille/oidc/clients.py:160
 msgid "The client has been edited."
 msgstr "Klienten har blitt redigert."
 
-#: canaille/oidc/clients.py:168
+#: canaille/oidc/clients.py:173
 msgid "The client has been deleted."
 msgstr "Klienten har blitt slettet."
 
-#: canaille/oidc/consents.py:73 canaille/oidc/consents.py:112
+#: canaille/oidc/consents.py:74 canaille/oidc/consents.py:113
 #, fuzzy
 msgid "Could not revoke this access"
 msgstr "Kunne ikke slette denne tilgangen"
 
-#: canaille/oidc/consents.py:76
+#: canaille/oidc/consents.py:77
 #, fuzzy
 msgid "The access is already revoked"
 msgstr "Tilgangen har blitt tilbakekalt"
 
-#: canaille/oidc/consents.py:80 canaille/oidc/consents.py:129
+#: canaille/oidc/consents.py:81 canaille/oidc/consents.py:130
 msgid "The access has been revoked"
 msgstr "Tilgangen har blitt tilbakekalt"
 
-#: canaille/oidc/consents.py:91
+#: canaille/oidc/consents.py:92
 #, fuzzy
 msgid "Could not restore this access"
 msgstr "Kunne ikke slette denne tilgangen"
 
-#: canaille/oidc/consents.py:94
+#: canaille/oidc/consents.py:95
 #, fuzzy
 msgid "The access is not revoked"
 msgstr "Tilgangen har blitt tilbakekalt"
 
-#: canaille/oidc/consents.py:101
+#: canaille/oidc/consents.py:102
 #, fuzzy
 msgid "The access has been restored"
 msgstr "Tilgangen har blitt tilbakekalt"
 
-#: canaille/oidc/endpoints.py:135
+#: canaille/oidc/endpoints.py:142
 msgid "You have been successfully logged out."
 msgstr "Du har blitt utlogget."
 
-#: canaille/oidc/endpoints.py:341
+#: canaille/oidc/endpoints.py:348
 msgid "You have been disconnected"
 msgstr "Du har blitt frakoblet"
 
-#: canaille/oidc/endpoints.py:358
+#: canaille/oidc/endpoints.py:365
 msgid "You have not been disconnected"
 msgstr "Du har ikke blitt koblet fra"
 
@@ -590,7 +623,7 @@ msgstr ""
 msgid "Pre-consent"
 msgstr "Forhåndssamtykke"
 
-#: canaille/oidc/tokens.py:58
+#: canaille/oidc/tokens.py:56
 #, fuzzy
 msgid "The token has successfully been revoked."
 msgstr "Tilgangen har blitt tilbakekalt"
@@ -755,13 +788,16 @@ msgstr ""
 #: canaille/templates/group.html:44
 #: canaille/templates/oidc/admin/client_edit.html:47
 #: canaille/templates/oidc/admin/token_view.html:50
+#: canaille/templates/profile_add.html:64
 #: canaille/templates/profile_settings.html:60
+#: canaille/templates/profile_settings.html:82
 msgid "Cancel"
 msgstr "Avbryt"
 
 #: canaille/templates/group.html:45
 #: canaille/templates/oidc/admin/client_edit.html:48
 #: canaille/templates/oidc/admin/token_view.html:51
+#: canaille/templates/profile_add.html:65
 #: canaille/templates/profile_settings.html:61
 msgid "Delete"
 msgstr "Slett"
@@ -789,11 +825,11 @@ msgstr "Slett gruppe"
 msgid "Create group"
 msgstr "Opprett gruppe"
 
-#: canaille/templates/group.html:90 canaille/templates/profile_add.html:210
+#: canaille/templates/group.html:90
+#: canaille/templates/oidc/admin/client_edit.html:98
 #: canaille/templates/profile_edit.html:181
-#: canaille/templates/profile_settings.html:151
-msgid "Submit"
-msgstr "Send inn"
+msgid "Edit"
+msgstr "Rediger"
 
 #: canaille/templates/group.html:102
 msgid "Group members"
@@ -908,170 +944,226 @@ msgstr "Jeg er ikke %(username)s"
 msgid "Sign in"
 msgstr "Logg inn"
 
-#: canaille/templates/profile_add.html:5 canaille/templates/profile_add.html:40
+#: canaille/templates/profile_add.html:5 canaille/templates/profile_add.html:74
 #: canaille/templates/profile_edit.html:6
 msgid "User creation"
 msgstr "Brukeropprettelse"
 
-#: canaille/templates/profile_add.html:44
-msgid "Create a new user account"
-msgstr "Opprett den nye brukerkontoen"
-
-#: canaille/templates/profile_add.html:49
-#: canaille/templates/profile_edit.html:23
-#: canaille/templates/profile_settings.html:21
-#, fuzzy
-msgid "Personal information"
-msgstr "Personsinfo"
-
-#: canaille/templates/profile_add.html:60
-#: canaille/templates/profile_add.html:71
-#: canaille/templates/profile_edit.html:78
-#: canaille/templates/profile_edit.html:89
-msgid "Click to upload a photo"
-msgstr "Klikk for å laste opp et bilde"
-
-#: canaille/templates/profile_add.html:161
-#: canaille/templates/profile_edit.html:27
-#: canaille/templates/profile_settings.html:25
-#: canaille/templates/profile_settings.html:69
-msgid "Account information"
-msgstr "Kontoinfo"
-
-#: canaille/templates/profile_add.html:185
-msgid "User password is not mandatory"
-msgstr ""
-
-#: canaille/templates/profile_add.html:188
-msgid "The user password can be set:"
-msgstr ""
-
-#: canaille/templates/profile_add.html:190
-msgid "by filling this form;"
-msgstr ""
-
-#: canaille/templates/profile_add.html:191
-msgid ""
-"by sending the user a password initialization mail, after the account "
-"creation;"
-msgstr ""
-
-#: canaille/templates/profile_add.html:192
-#: canaille/templates/profile_settings.html:109
-msgid ""
-"or simply waiting for the user to sign-in a first time, and then receive a "
-"password initialization mail."
-msgstr ""
-
-#: canaille/templates/profile_add.html:197
-msgid ""
-"The user will not be able to authenticate unless the password is set, but "
-"they will be able to ask for a password initialization mail."
-msgstr ""
-
-#: canaille/templates/profile_add.html:199
-msgid "The user will not be able to authenticate unless the password is set."
-msgstr ""
-
-#: canaille/templates/profile_edit.html:8
-#: canaille/templates/profile_edit.html:52
-#: canaille/templates/profile_settings.html:6
-msgid "My profile"
-msgstr "Min profil"
-
-#: canaille/templates/profile_edit.html:10
-#: canaille/templates/profile_edit.html:54
-#: canaille/templates/profile_settings.html:8
-msgid "User profile edition"
-msgstr ""
-
+#: canaille/templates/profile_add.html:41
 #: canaille/templates/profile_edit.html:41
 #: canaille/templates/profile_settings.html:37
 msgid "This user cannot edit this field"
 msgstr "Denne brukeren kan ikke redigere dette feltet"
 
+#: canaille/templates/profile_add.html:43
 #: canaille/templates/profile_edit.html:43
 #: canaille/templates/profile_settings.html:39
 msgid "This user cannot see this field"
 msgstr ""
 
-#: canaille/templates/profile_edit.html:60
-#, fuzzy
-msgid "Edit your personal information"
-msgstr "Rediger din personsinfo"
-
-#: canaille/templates/profile_edit.html:62
-msgid "Edit information about a user"
-msgstr "Rediger info om en bruker"
-
+#: canaille/templates/profile_add.html:52
 #: canaille/templates/profile_settings.html:48
 msgid "Account deletion"
 msgstr "Kontosletting"
 
+#: canaille/templates/profile_add.html:57
 #: canaille/templates/profile_settings.html:53
 msgid ""
 "Are you sure you want to delete this user? This action is unrevokable and "
 "all the data about this user will be removed."
 msgstr ""
 
+#: canaille/templates/profile_add.html:59
 #: canaille/templates/profile_settings.html:55
 msgid ""
 "Are you sure you want to delete your account? This action is unrevokable and "
 "all your data will be removed forever."
 msgstr ""
 
-#: canaille/templates/profile_settings.html:98
+#: canaille/templates/profile_add.html:76
+#: canaille/templates/profile_edit.html:8
+#: canaille/templates/profile_edit.html:52
+#: canaille/templates/profile_settings.html:6
+msgid "My profile"
+msgstr "Min profil"
+
+#: canaille/templates/profile_add.html:78
+#: canaille/templates/profile_edit.html:10
+#: canaille/templates/profile_edit.html:54
+#: canaille/templates/profile_settings.html:8
+msgid "User profile edition"
+msgstr ""
+
+#: canaille/templates/profile_add.html:84
+msgid "Create a new user account"
+msgstr "Opprett den nye brukerkontoen"
+
+#: canaille/templates/profile_add.html:86
+#: canaille/templates/profile_edit.html:60
+#, fuzzy
+msgid "Edit your personal information"
+msgstr "Rediger din personsinfo"
+
+#: canaille/templates/profile_add.html:88
+#: canaille/templates/profile_edit.html:62
+msgid "Edit information about a user"
+msgstr "Rediger info om en bruker"
+
+#: canaille/templates/profile_add.html:94
+#: canaille/templates/profile_edit.html:23
+#: canaille/templates/profile_settings.html:21
+#, fuzzy
+msgid "Personal information"
+msgstr "Personsinfo"
+
+#: canaille/templates/profile_add.html:106
+#: canaille/templates/profile_add.html:117
+#: canaille/templates/profile_edit.html:78
+#: canaille/templates/profile_edit.html:89
+msgid "Click to upload a photo"
+msgstr "Klikk for å laste opp et bilde"
+
+#: canaille/templates/profile_add.html:206
+#: canaille/templates/profile_edit.html:27
+#: canaille/templates/profile_settings.html:25
+#: canaille/templates/profile_settings.html:91
+msgid "Account information"
+msgstr "Kontoinfo"
+
+#: canaille/templates/profile_add.html:230
+msgid "User password is not mandatory"
+msgstr ""
+
+#: canaille/templates/profile_add.html:233
+msgid "The user password can be set:"
+msgstr ""
+
+#: canaille/templates/profile_add.html:235
+msgid "by filling this form;"
+msgstr ""
+
+#: canaille/templates/profile_add.html:236
+msgid ""
+"by sending the user a password initialization mail, after the account "
+"creation;"
+msgstr ""
+
+#: canaille/templates/profile_add.html:237
+#: canaille/templates/profile_settings.html:135
+msgid ""
+"or simply waiting for the user to sign-in a first time, and then receive a "
+"password initialization mail."
+msgstr ""
+
+#: canaille/templates/profile_add.html:242
+msgid ""
+"The user will not be able to authenticate unless the password is set, but "
+"they will be able to ask for a password initialization mail."
+msgstr ""
+
+#: canaille/templates/profile_add.html:244
+msgid "The user will not be able to authenticate unless the password is set."
+msgstr ""
+
+#: canaille/templates/profile_add.html:255
+#: canaille/templates/profile_settings.html:199
+msgid "Submit"
+msgstr "Send inn"
+
+#: canaille/templates/profile_settings.html:70
+#, fuzzy
+#| msgid "Account deletion"
+msgid "Account locking"
+msgstr "Kontosletting"
+
+#: canaille/templates/profile_settings.html:75
+msgid ""
+"Are you sure you want to lock this account? The user won't be able to login "
+"until their account is unlocked."
+msgstr ""
+
+#: canaille/templates/profile_settings.html:77
+msgid ""
+"Are you sure you want to lock your account? You won't be abel to login until "
+"your account is unlocked."
+msgstr ""
+
+#: canaille/templates/profile_settings.html:83
+msgid "Lock"
+msgstr ""
+
+#: canaille/templates/profile_settings.html:124
 #, fuzzy
 msgid "Send email"
 msgstr "Send e-post"
 
-#: canaille/templates/profile_settings.html:102
+#: canaille/templates/profile_settings.html:128
 msgid "This user does not have a password yet"
 msgstr ""
 
-#: canaille/templates/profile_settings.html:105
+#: canaille/templates/profile_settings.html:131
 msgid "You can solve this by:"
 msgstr "Du kan løse dette ved å:"
 
-#: canaille/templates/profile_settings.html:107
+#: canaille/templates/profile_settings.html:133
 msgid "setting a password using this form;"
 msgstr ""
 
-#: canaille/templates/profile_settings.html:108
+#: canaille/templates/profile_settings.html:134
 msgid ""
 "sending the user a password initialization mail, by clicking this button;"
 msgstr ""
 
-#: canaille/templates/profile_settings.html:112
+#: canaille/templates/profile_settings.html:138
 msgid "The user will not be able to authenticate unless the password is set"
 msgstr ""
 
-#: canaille/templates/profile_settings.html:120
+#: canaille/templates/profile_settings.html:146
 msgid "Send mail"
 msgstr "Send e-post"
 
 #: canaille/templates/mail/admin.html:97
-#: canaille/templates/profile_settings.html:123
+#: canaille/templates/profile_settings.html:149
 #: canaille/templates/reset-password.html:11
 #: canaille/templates/reset-password.html:16
 msgid "Password reset"
 msgstr "Passord tilbakestilt"
 
-#: canaille/templates/profile_settings.html:125
+#: canaille/templates/profile_settings.html:151
 msgid ""
 "If the user has forgotten his password, you can send him a password reset "
 "email by clicking this button."
 msgstr ""
 
-#: canaille/templates/profile_settings.html:137
+#: canaille/templates/profile_settings.html:160
+msgid "Unlock"
+msgstr ""
+
+#: canaille/templates/profile_settings.html:163
+#, fuzzy
+#| msgid "This user cannot edit this field"
+msgid "This user account is locked"
+msgstr "Denne brukeren kan ikke redigere dette feltet"
+
+#: canaille/templates/profile_settings.html:166
+msgid "The user won't be able to connect until their account is unlocked."
+msgstr ""
+
+#: canaille/templates/profile_settings.html:178
+#, fuzzy
+#| msgid "Delete my account"
+msgid "Lock the account"
+msgstr "Slett kontoen min"
+
+#: canaille/templates/profile_settings.html:185
 msgid "Delete the user"
 msgstr "Slett brukeren"
 
-#: canaille/templates/profile_settings.html:139
+#: canaille/templates/profile_settings.html:187
 msgid "Delete my account"
 msgstr "Slett kontoen min"
 
-#: canaille/templates/profile_settings.html:146
+#: canaille/templates/profile_settings.html:194
 msgid "Impersonate"
 msgstr ""
 
@@ -1080,14 +1172,14 @@ msgstr ""
 msgid "Users"
 msgstr "Brukere"
 
-#: canaille/templates/macro/form.html:67
+#: canaille/templates/macro/form.html:60
 #: canaille/templates/oidc/admin/client_edit.html:63
 #: canaille/templates/oidc/admin/client_edit.html:72
 #: canaille/templates/oidc/admin/client_edit.html:81
 msgid "This field is not editable"
 msgstr "Dette feltet kan ikke endres"
 
-#: canaille/templates/macro/form.html:71
+#: canaille/templates/macro/form.html:64
 msgid "This field is required"
 msgstr "Dette feltet er påkrevd"
 
@@ -1111,7 +1203,7 @@ msgstr ""
 
 #: canaille/templates/mail/admin.html:5 canaille/templates/mail/admin.html:12
 #: canaille/templates/oidc/admin/authorization_list.html:16
-#: canaille/templates/oidc/admin/authorization_view.html:12
+#: canaille/templates/oidc/admin/authorization_view.html:11
 #: canaille/templates/oidc/admin/client_add.html:12
 #: canaille/templates/oidc/admin/client_edit.html:16
 #: canaille/templates/oidc/admin/client_list.html:16
@@ -1123,7 +1215,7 @@ msgstr "E-poster"
 
 #: canaille/templates/mail/admin.html:16
 #: canaille/templates/oidc/admin/authorization_list.html:20
-#: canaille/templates/oidc/admin/authorization_view.html:16
+#: canaille/templates/oidc/admin/authorization_view.html:15
 #: canaille/templates/oidc/admin/client_add.html:16
 #: canaille/templates/oidc/admin/client_edit.html:20
 #: canaille/templates/oidc/admin/client_list.html:5
@@ -1136,7 +1228,7 @@ msgstr "Klienter"
 
 #: canaille/templates/mail/admin.html:20
 #: canaille/templates/oidc/admin/authorization_list.html:24
-#: canaille/templates/oidc/admin/authorization_view.html:20
+#: canaille/templates/oidc/admin/authorization_view.html:19
 #: canaille/templates/oidc/admin/client_add.html:5
 #: canaille/templates/oidc/admin/client_add.html:20
 #: canaille/templates/oidc/admin/client_add.html:36
@@ -1149,7 +1241,7 @@ msgstr "Legg til en klient"
 
 #: canaille/templates/mail/admin.html:24
 #: canaille/templates/oidc/admin/authorization_list.html:28
-#: canaille/templates/oidc/admin/authorization_view.html:24
+#: canaille/templates/oidc/admin/authorization_view.html:23
 #: canaille/templates/oidc/admin/client_add.html:24
 #: canaille/templates/oidc/admin/client_edit.html:28
 #: canaille/templates/oidc/admin/client_list.html:28
@@ -1164,7 +1256,7 @@ msgstr "Symbol"
 #: canaille/templates/oidc/admin/authorization_list.html:5
 #: canaille/templates/oidc/admin/authorization_list.html:32
 #: canaille/templates/oidc/admin/authorization_list.html:41
-#: canaille/templates/oidc/admin/authorization_view.html:28
+#: canaille/templates/oidc/admin/authorization_view.html:27
 #: canaille/templates/oidc/admin/client_add.html:28
 #: canaille/templates/oidc/admin/client_edit.html:32
 #: canaille/templates/oidc/admin/client_list.html:32
@@ -1282,14 +1374,16 @@ msgid ""
 "%(site_name)s."
 msgstr ""
 
-#: canaille/templates/oidc/admin/authorization_view.html:5
-#: canaille/templates/oidc/admin/authorization_view.html:36
+#: canaille/templates/oidc/admin/authorization_view.html:4
+#: canaille/templates/oidc/admin/authorization_view.html:35
 msgid "View an authorization"
 msgstr ""
 
 #: canaille/templates/oidc/admin/client_add.html:39
-msgid "Confirm"
-msgstr "Bekreft"
+#, fuzzy
+#| msgid "Created"
+msgid "Create"
+msgstr "Opprettet"
 
 #: canaille/templates/oidc/admin/client_edit.html:5
 #: canaille/templates/oidc/admin/client_edit.html:54
@@ -1322,10 +1416,6 @@ msgstr "Utstedt"
 msgid "Delete the client"
 msgstr "Slett klienten"
 
-#: canaille/templates/oidc/admin/client_edit.html:98
-msgid "Edit"
-msgstr "Rediger"
-
 #: canaille/templates/oidc/admin/token_view.html:5
 #: canaille/templates/oidc/admin/token_view.html:57
 #, fuzzy
@@ -1422,7 +1512,7 @@ msgstr "Mine samtykker"
 
 #: canaille/templates/oidc/user/consent_list.html:20
 #: canaille/templates/oidc/user/preconsent_list.html:20
-#: canaille/templates/oidc/user/preconsent_list.html:31
+#: canaille/templates/oidc/user/preconsent_list.html:30
 msgid "Pre-authorized applications"
 msgstr ""
 
@@ -1444,18 +1534,18 @@ msgid "Had access to:"
 msgstr "Har tilgang til:"
 
 #: canaille/templates/oidc/user/consent_list.html:61
-#: canaille/templates/oidc/user/preconsent_list.html:51
+#: canaille/templates/oidc/user/preconsent_list.html:52
 msgid "Has access to:"
 msgstr "Har tilgang til:"
 
 #: canaille/templates/oidc/user/consent_list.html:84
-#: canaille/templates/oidc/user/preconsent_list.html:73
+#: canaille/templates/oidc/user/preconsent_list.html:74
 #, fuzzy
 msgid "Policy"
 msgstr "Praksis-URI"
 
 #: canaille/templates/oidc/user/consent_list.html:92
-#: canaille/templates/oidc/user/preconsent_list.html:81
+#: canaille/templates/oidc/user/preconsent_list.html:82
 #, fuzzy
 msgid "Terms of service"
 msgstr "Tjenestevilkår-URI"
@@ -1466,7 +1556,7 @@ msgid "Restore access"
 msgstr "Fjern tilgang"
 
 #: canaille/templates/oidc/user/consent_list.html:104
-#: canaille/templates/oidc/user/preconsent_list.html:87
+#: canaille/templates/oidc/user/preconsent_list.html:88
 #, fuzzy
 msgid "Revoke access"
 msgstr "Fjern tilgang"
@@ -1503,11 +1593,21 @@ msgstr "Forbli innlogget"
 msgid "Logout"
 msgstr "Logg ut"
 
-#: canaille/templates/oidc/user/preconsent_list.html:34
+#: canaille/templates/oidc/user/preconsent_list.html:33
 msgid ""
 "Those applications automatically have authorizations to access you data."
 msgstr ""
 
+#: canaille/templates/oidc/user/preconsent_list.html:97
+#: canaille/templates/partial/groups.html:36
+#: canaille/templates/partial/oidc/admin/authorization_list.html:36
+#: canaille/templates/partial/oidc/admin/client_list.html:40
+#: canaille/templates/partial/oidc/admin/token_list.html:44
+#: canaille/templates/partial/users.html:70
+#, fuzzy
+msgid "There is nothing here"
+msgstr "Tilgangen har blitt tilbakekalt"
+
 #: canaille/templates/partial/groups.html:8
 msgid "Number of members"
 msgstr "Antall medlemmer"
@@ -1516,7 +1616,7 @@ msgstr "Antall medlemmer"
 #: canaille/templates/partial/oidc/admin/authorization_list.html:31
 #: canaille/templates/partial/oidc/admin/client_list.html:35
 #: canaille/templates/partial/oidc/admin/token_list.html:39
-#: canaille/templates/partial/users.html:63
+#: canaille/templates/partial/users.html:65
 msgid "No item matches your request"
 msgstr ""
 
@@ -1524,18 +1624,13 @@ msgstr ""
 #: canaille/templates/partial/oidc/admin/authorization_list.html:33
 #: canaille/templates/partial/oidc/admin/client_list.html:37
 #: canaille/templates/partial/oidc/admin/token_list.html:41
-#: canaille/templates/partial/users.html:65
+#: canaille/templates/partial/users.html:67
 msgid "Maybe try with different criterias?"
 msgstr ""
 
-#: canaille/templates/partial/groups.html:36
-#: canaille/templates/partial/oidc/admin/authorization_list.html:36
-#: canaille/templates/partial/oidc/admin/client_list.html:40
-#: canaille/templates/partial/oidc/admin/token_list.html:44
-#: canaille/templates/partial/users.html:68
-#, fuzzy
-msgid "There is nothing here"
-msgstr "Tilgangen har blitt tilbakekalt"
+#: canaille/templates/partial/users.html:29
+msgid "This account is locked"
+msgstr ""
 
 #: canaille/templates/partial/oidc/admin/authorization_list.html:5
 msgid "Code"
@@ -1575,6 +1670,9 @@ msgstr "Mine samtykker"
 msgid "Admin"
 msgstr ""
 
+#~ msgid "Confirm"
+#~ msgstr "Bekreft"
+
 #, fuzzy
 #~ msgid "Employee number"
 #~ msgstr "Telefonnummer"