diff --git a/hiboo/translations/en/LC_MESSAGES/messages.po b/hiboo/translations/en/LC_MESSAGES/messages.po
index f3678e814cd884d0b9cf77426666f7a76774c0d5..5d853a7d98f585060125c19f766dc3da22be3686 100644
--- a/hiboo/translations/en/LC_MESSAGES/messages.po
+++ b/hiboo/translations/en/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-10-20 22:28+0200\n"
+"POT-Creation-Date: 2019-11-13 22:27+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -19,43 +19,56 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: hiboo/models.py:150
+#: hiboo/models.py:153
 msgid "Profile creation is impossible"
 msgstr ""
 
-#: hiboo/models.py:151
+#: hiboo/models.py:154
 msgid "Profile creation is reserved to managers"
 msgstr ""
 
-#: hiboo/models.py:152
+#: hiboo/models.py:155
 msgid "Profile creation must be validated"
 msgstr ""
 
-#: hiboo/models.py:153
+#: hiboo/models.py:156
 msgid "Additional profiles must be validated"
 msgstr ""
 
-#: hiboo/models.py:154
+#: hiboo/models.py:157
 msgid "No validation is required"
 msgstr ""
 
-#: hiboo/models.py:213
+#: hiboo/models.py:218
 msgid "signed up for this account"
 msgstr ""
 
-#: hiboo/models.py:214
+#: hiboo/models.py:219
 msgid "created the profile {this.profile.username} on {this.service.name}"
 msgstr ""
 
-#: hiboo/models.py:215
+#: hiboo/models.py:220
 msgid "changed your password"
 msgstr ""
 
-#: hiboo/account/forms.py:8 hiboo/account/forms.py:14 hiboo/account/forms.py:34
+#: hiboo/models.py:221
+msgid "{this.value} the profile {this.profile.username} on {this.service.name}"
+msgstr ""
+
+#: hiboo/security.py:48
+msgid "Confirm"
+msgstr ""
+
+#: hiboo/account/forms.py:8 hiboo/account/forms.py:14 hiboo/profile/forms.py:8
+#: hiboo/profile/forms.py:18 hiboo/profile/templates/profile_details.html:12
+#: hiboo/user/templates/user_details.html:12
+#: hiboo/user/templates/user_details.html:35
+#: hiboo/user/templates/user_list.html:12
+#: hiboo/user/templates/user_pick.html:12
 msgid "Username"
 msgstr ""
 
-#: hiboo/account/forms.py:9 hiboo/account/forms.py:19
+#: hiboo/account/forms.py:9 hiboo/account/forms.py:19 hiboo/profile/forms.py:19
 msgid "Password"
 msgstr ""
 
@@ -68,8 +81,7 @@ msgstr ""
 msgid "Confirm password"
 msgstr ""
 
-#: hiboo/account/forms.py:22 hiboo/account/forms.py:44
-#: hiboo/account/templates/account_signin.html:20
+#: hiboo/account/forms.py:22 hiboo/account/templates/account_signin.html:20
 #: hiboo/account/templates/account_signup.html:3
 #: hiboo/templates/sidebar.html:21
 msgid "Sign up"
@@ -91,14 +103,6 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: hiboo/account/forms.py:35
-msgid "Comment"
-msgstr ""
-
-#: hiboo/account/forms.py:36
-msgid "Create profile"
-msgstr ""
-
 #: hiboo/account/templates/account_home.html:3 hiboo/templates/sidebar.html:5
 msgid "My account"
 msgstr ""
@@ -182,108 +186,194 @@ msgid ""
 "notified first."
 msgstr ""
 
-#: hiboo/account/templates/profile_create.html:4
-msgid "New profile"
+#: hiboo/profile/forms.py:9
+msgid "Comment"
+msgstr ""
+
+#: hiboo/profile/forms.py:10
+msgid "Create profile"
 msgstr ""
 
-#: hiboo/account/templates/profile_create.html:5
-#: hiboo/account/templates/profile_pick.html:7
+#: hiboo/profile/forms.py:20 hiboo/profile/templates/profile_claim.html:4
+msgid "Claim profile"
+msgstr ""
+
+#: hiboo/profile/templates/profile_claim.html:5
+#: hiboo/profile/templates/profile_create.html:6
+#: hiboo/profile/templates/profile_pick.html:7
 #, python-format
 msgid "for the service %(service_name)s"
 msgstr ""
 
-#: hiboo/account/templates/profile_create.html:9
-msgid "Create a new profile"
+#: hiboo/profile/templates/profile_claim.html:9
+msgid "Claim an existing profile"
 msgstr ""
 
-#: hiboo/account/templates/profile_create.html:10
+#: hiboo/profile/templates/profile_claim.html:10
+#: hiboo/profile/templates/profile_create.html:13
 msgid "You are about to create your first profile."
 msgstr ""
 
-#: hiboo/account/templates/profile_create.html:11
+#: hiboo/profile/templates/profile_claim.html:11
+#: hiboo/profile/templates/profile_create.html:14
 msgid ""
 "Please choose a username wisely, you will not be able to change it later."
 " You may pick anything that is valid for the service, as long as it is "
 "available."
 msgstr ""
 
-#: hiboo/account/templates/profile_create.html:12
+#: hiboo/profile/templates/profile_claim.html:12
+#: hiboo/profile/templates/profile_create.html:15
 msgid ""
 "If your profile request is submitted for validation, please add a useful "
 "comment that will help us validate (describe shortly what your profile is"
 " for or why you need one)."
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:6
+#: hiboo/profile/templates/profile_create.html:4
+msgid "New profile"
+msgstr ""
+
+#: hiboo/profile/templates/profile_create.html:7
+msgid "and user"
+msgstr ""
+
+#: hiboo/profile/templates/profile_create.html:12
+msgid "Create a new profile"
+msgstr ""
+
+#: hiboo/profile/templates/profile_details.html:4
+msgid "profile details"
+msgstr ""
+
+#: hiboo/profile/templates/profile_details.html:15
+msgid "Owner"
+msgstr ""
+
+#: hiboo/profile/templates/profile_details.html:18
+#: hiboo/service/templates/service_details.html:19
+#: hiboo/user/templates/user_details.html:15
+msgid "UUID"
+msgstr ""
+
+#: hiboo/profile/templates/profile_details.html:21
+#: hiboo/profile/templates/profile_list.html:20
+#: hiboo/user/templates/user_details.html:36
+msgid "Status"
+msgstr ""
+
+#: hiboo/profile/templates/profile_details.html:24
+#: hiboo/user/templates/user_details.html:18
+msgid "Created at"
+msgstr ""
+
+#: hiboo/profile/templates/profile_details.html:40
+msgid "Block profile"
+msgstr ""
+
+#: hiboo/profile/templates/profile_details.html:42
+msgid "Unblock profile"
+msgstr ""
+
+#: hiboo/profile/templates/profile_list.html:16
+#: hiboo/service/templates/service_list.html:13
+#: hiboo/user/templates/user_details.html:34
+msgid "Service"
+msgstr ""
+
+#: hiboo/profile/templates/profile_list.html:18
+msgid "Profile username"
+msgstr ""
+
+#: hiboo/profile/templates/profile_list.html:19
+msgid "Owned by"
+msgstr ""
+
+#: hiboo/profile/templates/profile_list.html:21
+#: hiboo/user/templates/user_list.html:13
+#: hiboo/user/templates/user_pick.html:13
+msgid "Created on"
+msgstr ""
+
+#: hiboo/profile/templates/profile_list.html:22
+#: hiboo/service/templates/service_list.html:18
+msgid "Actions"
+msgstr ""
+
+#: hiboo/profile/templates/profile_list.html:50
+msgid "Create a profile"
+msgstr ""
+
+#: hiboo/profile/templates/profile_pick.html:6
 msgid "Pick a profile"
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:22
+#: hiboo/profile/templates/profile_pick.html:22
 msgid "Blocked"
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:24
+#: hiboo/profile/templates/profile_pick.html:24
 msgid "Awaiting approval"
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:32
+#: hiboo/profile/templates/profile_pick.html:32
 #, python-format
 msgid "Created on %(created_on)s"
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:33
+#: hiboo/profile/templates/profile_pick.html:33
 msgid "Not shared with anyone"
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:41
+#: hiboo/profile/templates/profile_pick.html:41
 msgid "Here come profiles!"
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:43
+#: hiboo/profile/templates/profile_pick.html:43
 msgid ""
 "This service relies on profiles, which are just as many identities that "
 "you can have with your single Hiboo account."
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:44
+#: hiboo/profile/templates/profile_pick.html:44
 msgid ""
 "You may think of profiles as a way to have both a personal and an "
 "organization account, or to use the service under different identities "
 "for diffrent activities."
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:45
+#: hiboo/profile/templates/profile_pick.html:45
 msgid ""
 "Profiles were introduced in order to offer flexibility and security "
 "against stalkers and other sorts of online violence."
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:48
+#: hiboo/profile/templates/profile_pick.html:48
 msgid ""
 "However, profile creation on this services are currently locked down. You"
 " may only use existing profiles if you have some."
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:50
+#: hiboo/profile/templates/profile_pick.html:50
 msgid ""
 "This service is not currently open for profile registration. In order to "
 "get new profiles, you must ask a service administrator."
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:52
+#: hiboo/profile/templates/profile_pick.html:52
 msgid ""
 "You may request new profiles. Your requests will be submitted to "
 "validation."
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:54
+#: hiboo/profile/templates/profile_pick.html:54
 #, python-format
 msgid ""
 "You may create up to %(max_profiles)s profiles. Further profile requests "
 "will be submitted to validation."
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:56
+#: hiboo/profile/templates/profile_pick.html:56
 #, python-format
 msgid ""
 "You may create up to %(max_profiles)s profiles. Please contact the "
@@ -314,44 +404,53 @@ msgstr ""
 msgid "Maximum profile count"
 msgstr ""
 
-#: hiboo/service/forms.py:19 hiboo/sso/forms.py:10
+#: hiboo/service/forms.py:19
+msgid "Disable per-profile username"
+msgstr ""
+
+#: hiboo/service/forms.py:20 hiboo/sso/forms.py:16 hiboo/sso/forms.py:42
 msgid "Submit"
 msgstr ""
 
-#: hiboo/service/templates/service_create.html:3
-#: hiboo/service/templates/service_create_form.html:3
-#: hiboo/service/templates/service_list.html:34
+#: hiboo/service/templates/protocol_pick.html:3
+#: hiboo/service/templates/service_create.html:4
+#: hiboo/service/templates/service_list.html:42
 msgid "Create a service"
 msgstr ""
 
-#: hiboo/service/templates/service_create.html:4
+#: hiboo/service/templates/protocol_pick.html:4
 msgid "pick a protocol"
 msgstr ""
 
-#: hiboo/service/templates/service_create.html:16
+#: hiboo/service/templates/protocol_pick.html:16
 msgid "Create "
 msgstr ""
 
-#: hiboo/service/templates/service_create_form.html:4
-msgid "add a SAML service"
+#: hiboo/service/templates/service_create.html:5
+#, python-format
+msgid "add a %(protocol_name)s service"
 msgstr ""
 
 #: hiboo/service/templates/service_details.html:5
 msgid "service details"
 msgstr ""
 
-#: hiboo/service/templates/service_details.html:19
-msgid "UUID"
+#: hiboo/service/templates/service_details.html:31
+msgid "View profiles"
 msgstr ""
 
-#: hiboo/service/templates/service_details.html:31
+#: hiboo/service/templates/service_details.html:32
 msgid "Edit this service"
 msgstr ""
 
-#: hiboo/service/templates/service_details.html:32
+#: hiboo/service/templates/service_details.html:33
 msgid "Delete this service"
 msgstr ""
 
+#: hiboo/service/templates/service_edit.html:3
+msgid "Edit a service"
+msgstr ""
+
 #: hiboo/service/templates/service_list.html:3
 msgid "Service list"
 msgstr ""
@@ -360,15 +459,15 @@ msgstr ""
 msgid "all available services"
 msgstr ""
 
-#: hiboo/service/templates/service_list.html:13
-msgid "Service"
+#: hiboo/service/templates/service_list.html:15
+msgid "Type"
 msgstr ""
 
-#: hiboo/service/templates/service_list.html:15
+#: hiboo/service/templates/service_list.html:16
 msgid "Policy"
 msgstr ""
 
-#: hiboo/service/templates/service_list.html:16
+#: hiboo/service/templates/service_list.html:17
 msgid "Max profiles"
 msgstr ""
 
@@ -380,12 +479,92 @@ msgstr ""
 msgid "SP ACS"
 msgstr ""
 
+#: hiboo/sso/forms.py:11
+msgid "Signature mode"
+msgstr ""
+
+#: hiboo/sso/forms.py:12
+msgid "Sign the full response"
+msgstr ""
+
+#: hiboo/sso/forms.py:13
+msgid "Sign only the assertion"
+msgstr ""
+
+#: hiboo/sso/forms.py:20
+msgid "Redirect URI"
+msgstr ""
+
+#: hiboo/sso/forms.py:22
+msgid "Token Endpoint Auth Method"
+msgstr ""
+
+#: hiboo/sso/forms.py:23
+msgid "HTTP POST data"
+msgstr ""
+
+#: hiboo/sso/forms.py:24
+msgid "HTTP basic authorization"
+msgstr ""
+
+#: hiboo/sso/forms.py:25
+msgid "No authentication"
+msgstr ""
+
+#: hiboo/sso/forms.py:29
+msgid "OpenID Connect grant type"
+msgstr ""
+
+#: hiboo/sso/forms.py:30
+msgid "Authorization Code"
+msgstr ""
+
+#: hiboo/sso/forms.py:31
+msgid "Implicit"
+msgstr ""
+
+#: hiboo/sso/forms.py:32
+msgid "Hybrid"
+msgstr ""
+
+#: hiboo/sso/forms.py:36
+msgid "Allowed response types"
+msgstr ""
+
+#: hiboo/sso/forms.py:37
+msgid "Authorization code only"
+msgstr ""
+
+#: hiboo/sso/forms.py:38
+msgid "Id token only"
+msgstr ""
+
+#: hiboo/sso/forms.py:39
+msgid "Id token and token"
+msgstr ""
+
 #: hiboo/sso/templates/protocol_oidc.html:2
 msgid ""
 "OpenID Connect (OIDC) is JWT based authentication and authorization "
 "protocol"
 msgstr ""
 
+#: hiboo/sso/templates/protocol_oidc.html:5
+msgid "Authorization endpoint"
+msgstr ""
+
+#: hiboo/sso/templates/protocol_oidc.html:8
+msgid "Token endpoint"
+msgstr ""
+
+#: hiboo/sso/templates/protocol_oidc.html:11
+msgid "Client ID"
+msgstr ""
+
+#: hiboo/sso/templates/protocol_oidc.html:14
+msgid "Client secret"
+msgstr ""
+
 #: hiboo/sso/templates/protocol_saml.html:2
 msgid ""
 "SAML2 is a legacy protocol based on XML security. Only redirect/post "
@@ -446,7 +625,16 @@ msgstr ""
 msgid "Hiboo is free software distributed under the MIT license"
 msgstr ""
 
-#: hiboo/templates/macros.html:51
+#: hiboo/templates/confirm.html:3
+msgid "Confirm your action"
+msgstr ""
+
+#: hiboo/templates/confirm.html:8
+#, python-format
+msgid "Your are about to %(action)s. Do you wish to confirm that action?"
+msgstr ""
+
+#: hiboo/templates/macros.html:53
 msgid "Close"
 msgstr ""
 
@@ -463,17 +651,33 @@ msgid "Services"
 msgstr ""
 
 #: hiboo/templates/sidebar.html:40
+msgid "Users"
+msgstr ""
+
+#: hiboo/templates/sidebar.html:45
 msgid "About"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:43
+#: hiboo/templates/sidebar.html:48
 msgid "User guide"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:48
+#: hiboo/templates/sidebar.html:53
 msgid "Admin guide"
 msgstr ""
 
+#: hiboo/user/templates/user_details.html:4
+msgid "user details"
+msgstr ""
+
+#: hiboo/user/templates/user_list.html:3
+msgid "Manage users"
+msgstr ""
+
+#: hiboo/user/templates/user_pick.html:3
+msgid "Pick a user"
+msgstr ""
+
 #~ msgid "Welcome to Hiboo!"
 #~ msgstr ""
 
@@ -504,3 +708,6 @@ msgstr ""
 #~ msgid "If you wish to contribute help messages, please contact us."
 #~ msgstr ""
 
+#~ msgid "add a SAML service"
+#~ msgstr ""
+
diff --git a/hiboo/translations/fr/LC_MESSAGES/messages.po b/hiboo/translations/fr/LC_MESSAGES/messages.po
index 895ba7a10de5e36e233dc0739d1ba03bc18402e5..a171f13ee729818254eec9fcc537907c83f60101 100644
--- a/hiboo/translations/fr/LC_MESSAGES/messages.po
+++ b/hiboo/translations/fr/LC_MESSAGES/messages.po
@@ -7,57 +7,69 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-10-20 22:28+0200\n"
+"POT-Creation-Date: 2019-11-13 22:27+0100\n"
 "PO-Revision-Date: 2019-10-20 18:31+0000\n"
 "Last-Translator: Angedestenebres <angedestenebres@tugaleres.com>\n"
-"Language-Team: French <https://translate.tedomum.net/projects/hiboo/main/fr/>"
-"\n"
 "Language: fr\n"
+"Language-Team: French "
+"<https://translate.tedomum.net/projects/hiboo/main/fr/>\n"
+"Plural-Forms: nplurals=2; plural=n > 1\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.3\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: hiboo/models.py:150
+#: hiboo/models.py:153
 msgid "Profile creation is impossible"
 msgstr "La création de profil est impossible"
 
-#: hiboo/models.py:151
+#: hiboo/models.py:154
 msgid "Profile creation is reserved to managers"
 msgstr "La création de profil est réservées aux managers"
 
-#: hiboo/models.py:152
+#: hiboo/models.py:155
 msgid "Profile creation must be validated"
 msgstr "La création de profil doit être validée"
 
-#: hiboo/models.py:153
+#: hiboo/models.py:156
 msgid "Additional profiles must be validated"
 msgstr "Les profils additionnels doivent être validés"
 
-#: hiboo/models.py:154
+#: hiboo/models.py:157
 msgid "No validation is required"
 msgstr "Aucune validation n'est requise"
 
-#: hiboo/models.py:213
+#: hiboo/models.py:218
 #, fuzzy
 msgid "signed up for this account"
 msgstr "Inscrit avec ce compte"
 
-#: hiboo/models.py:214
+#: hiboo/models.py:219
 msgid "created the profile {this.profile.username} on {this.service.name}"
 msgstr "Le profil {this.profile.username} a été créé sur {this.service.name}"
 
-#: hiboo/models.py:215
+#: hiboo/models.py:220
 msgid "changed your password"
 msgstr "Votre mot de passe a été changé"
 
-#: hiboo/account/forms.py:8 hiboo/account/forms.py:14 hiboo/account/forms.py:34
+#: hiboo/models.py:221
+msgid "{this.value} the profile {this.profile.username} on {this.service.name}"
+msgstr ""
+
+#: hiboo/security.py:48
+msgid "Confirm"
+msgstr ""
+
+#: hiboo/account/forms.py:8 hiboo/account/forms.py:14 hiboo/profile/forms.py:8
+#: hiboo/profile/forms.py:18 hiboo/profile/templates/profile_details.html:12
+#: hiboo/user/templates/user_details.html:12
+#: hiboo/user/templates/user_details.html:35
+#: hiboo/user/templates/user_list.html:12
+#: hiboo/user/templates/user_pick.html:12
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: hiboo/account/forms.py:9 hiboo/account/forms.py:19
+#: hiboo/account/forms.py:9 hiboo/account/forms.py:19 hiboo/profile/forms.py:19
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -70,8 +82,7 @@ msgstr "Se connecter"
 msgid "Confirm password"
 msgstr "Confirmer le mot de passe"
 
-#: hiboo/account/forms.py:22 hiboo/account/forms.py:44
-#: hiboo/account/templates/account_signin.html:20
+#: hiboo/account/forms.py:22 hiboo/account/templates/account_signin.html:20
 #: hiboo/account/templates/account_signup.html:3
 #: hiboo/templates/sidebar.html:21
 msgid "Sign up"
@@ -93,14 +104,6 @@ msgstr "Confirmer le nouveau mot de passe"
 msgid "Change password"
 msgstr "Changer le mot de passe"
 
-#: hiboo/account/forms.py:35
-msgid "Comment"
-msgstr "Commentaire"
-
-#: hiboo/account/forms.py:36
-msgid "Create profile"
-msgstr "Créer un profil"
-
 #: hiboo/account/templates/account_home.html:3 hiboo/templates/sidebar.html:5
 msgid "My account"
 msgstr "Mon compte"
@@ -206,108 +209,194 @@ msgid ""
 "notified first."
 msgstr ""
 
-#: hiboo/account/templates/profile_create.html:4
-msgid "New profile"
-msgstr "Nouveau profil"
+#: hiboo/profile/forms.py:9
+msgid "Comment"
+msgstr "Commentaire"
 
-#: hiboo/account/templates/profile_create.html:5
-#: hiboo/account/templates/profile_pick.html:7
+#: hiboo/profile/forms.py:10
+msgid "Create profile"
+msgstr "Créer un profil"
+
+#: hiboo/profile/forms.py:20 hiboo/profile/templates/profile_claim.html:4
+msgid "Claim profile"
+msgstr ""
+
+#: hiboo/profile/templates/profile_claim.html:5
+#: hiboo/profile/templates/profile_create.html:6
+#: hiboo/profile/templates/profile_pick.html:7
 #, python-format
 msgid "for the service %(service_name)s"
 msgstr "pour le service %(service_name)s"
 
-#: hiboo/account/templates/profile_create.html:9
-msgid "Create a new profile"
-msgstr "Créer un nouveau profil"
+#: hiboo/profile/templates/profile_claim.html:9
+msgid "Claim an existing profile"
+msgstr ""
 
-#: hiboo/account/templates/profile_create.html:10
+#: hiboo/profile/templates/profile_claim.html:10
+#: hiboo/profile/templates/profile_create.html:13
 msgid "You are about to create your first profile."
 msgstr "Vous vous apprêtez à créer votre premier profil."
 
-#: hiboo/account/templates/profile_create.html:11
+#: hiboo/profile/templates/profile_claim.html:11
+#: hiboo/profile/templates/profile_create.html:14
 msgid ""
 "Please choose a username wisely, you will not be able to change it later."
 " You may pick anything that is valid for the service, as long as it is "
 "available."
 msgstr ""
 
-#: hiboo/account/templates/profile_create.html:12
+#: hiboo/profile/templates/profile_claim.html:12
+#: hiboo/profile/templates/profile_create.html:15
 msgid ""
 "If your profile request is submitted for validation, please add a useful "
 "comment that will help us validate (describe shortly what your profile is"
 " for or why you need one)."
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:6
+#: hiboo/profile/templates/profile_create.html:4
+msgid "New profile"
+msgstr "Nouveau profil"
+
+#: hiboo/profile/templates/profile_create.html:7
+msgid "and user"
+msgstr ""
+
+#: hiboo/profile/templates/profile_create.html:12
+msgid "Create a new profile"
+msgstr "Créer un nouveau profil"
+
+#: hiboo/profile/templates/profile_details.html:4
+msgid "profile details"
+msgstr ""
+
+#: hiboo/profile/templates/profile_details.html:15
+msgid "Owner"
+msgstr ""
+
+#: hiboo/profile/templates/profile_details.html:18
+#: hiboo/service/templates/service_details.html:19
+#: hiboo/user/templates/user_details.html:15
+msgid "UUID"
+msgstr "UUID"
+
+#: hiboo/profile/templates/profile_details.html:21
+#: hiboo/profile/templates/profile_list.html:20
+#: hiboo/user/templates/user_details.html:36
+msgid "Status"
+msgstr ""
+
+#: hiboo/profile/templates/profile_details.html:24
+#: hiboo/user/templates/user_details.html:18
+msgid "Created at"
+msgstr ""
+
+#: hiboo/profile/templates/profile_details.html:40
+msgid "Block profile"
+msgstr ""
+
+#: hiboo/profile/templates/profile_details.html:42
+msgid "Unblock profile"
+msgstr ""
+
+#: hiboo/profile/templates/profile_list.html:16
+#: hiboo/service/templates/service_list.html:13
+#: hiboo/user/templates/user_details.html:34
+msgid "Service"
+msgstr "Service"
+
+#: hiboo/profile/templates/profile_list.html:18
+msgid "Profile username"
+msgstr ""
+
+#: hiboo/profile/templates/profile_list.html:19
+msgid "Owned by"
+msgstr ""
+
+#: hiboo/profile/templates/profile_list.html:21
+#: hiboo/user/templates/user_list.html:13
+#: hiboo/user/templates/user_pick.html:13
+msgid "Created on"
+msgstr ""
+
+#: hiboo/profile/templates/profile_list.html:22
+#: hiboo/service/templates/service_list.html:18
+msgid "Actions"
+msgstr ""
+
+#: hiboo/profile/templates/profile_list.html:50
+msgid "Create a profile"
+msgstr ""
+
+#: hiboo/profile/templates/profile_pick.html:6
 msgid "Pick a profile"
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:22
+#: hiboo/profile/templates/profile_pick.html:22
 msgid "Blocked"
 msgstr "Bloqué"
 
-#: hiboo/account/templates/profile_pick.html:24
+#: hiboo/profile/templates/profile_pick.html:24
 msgid "Awaiting approval"
 msgstr "En attente de validation"
 
-#: hiboo/account/templates/profile_pick.html:32
+#: hiboo/profile/templates/profile_pick.html:32
 #, python-format
 msgid "Created on %(created_on)s"
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:33
+#: hiboo/profile/templates/profile_pick.html:33
 msgid "Not shared with anyone"
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:41
+#: hiboo/profile/templates/profile_pick.html:41
 msgid "Here come profiles!"
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:43
+#: hiboo/profile/templates/profile_pick.html:43
 msgid ""
 "This service relies on profiles, which are just as many identities that "
 "you can have with your single Hiboo account."
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:44
+#: hiboo/profile/templates/profile_pick.html:44
 msgid ""
 "You may think of profiles as a way to have both a personal and an "
 "organization account, or to use the service under different identities "
 "for diffrent activities."
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:45
+#: hiboo/profile/templates/profile_pick.html:45
 msgid ""
 "Profiles were introduced in order to offer flexibility and security "
 "against stalkers and other sorts of online violence."
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:48
+#: hiboo/profile/templates/profile_pick.html:48
 msgid ""
 "However, profile creation on this services are currently locked down. You"
 " may only use existing profiles if you have some."
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:50
+#: hiboo/profile/templates/profile_pick.html:50
 msgid ""
 "This service is not currently open for profile registration. In order to "
 "get new profiles, you must ask a service administrator."
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:52
+#: hiboo/profile/templates/profile_pick.html:52
 msgid ""
 "You may request new profiles. Your requests will be submitted to "
 "validation."
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:54
+#: hiboo/profile/templates/profile_pick.html:54
 #, python-format
 msgid ""
 "You may create up to %(max_profiles)s profiles. Further profile requests "
 "will be submitted to validation."
 msgstr ""
 
-#: hiboo/account/templates/profile_pick.html:56
+#: hiboo/profile/templates/profile_pick.html:56
 #, python-format
 msgid ""
 "You may create up to %(max_profiles)s profiles. Please contact the "
@@ -338,45 +427,54 @@ msgstr ""
 msgid "Maximum profile count"
 msgstr ""
 
-#: hiboo/service/forms.py:19 hiboo/sso/forms.py:10
+#: hiboo/service/forms.py:19
+msgid "Disable per-profile username"
+msgstr ""
+
+#: hiboo/service/forms.py:20 hiboo/sso/forms.py:16 hiboo/sso/forms.py:42
 msgid "Submit"
 msgstr ""
 
-#: hiboo/service/templates/service_create.html:3
-#: hiboo/service/templates/service_create_form.html:3
-#: hiboo/service/templates/service_list.html:34
+#: hiboo/service/templates/protocol_pick.html:3
+#: hiboo/service/templates/service_create.html:4
+#: hiboo/service/templates/service_list.html:42
 msgid "Create a service"
 msgstr "Créer un service"
 
-#: hiboo/service/templates/service_create.html:4
+#: hiboo/service/templates/protocol_pick.html:4
 msgid "pick a protocol"
 msgstr ""
 
-#: hiboo/service/templates/service_create.html:16
+#: hiboo/service/templates/protocol_pick.html:16
 msgid "Create "
 msgstr "Créer "
 
-#: hiboo/service/templates/service_create_form.html:4
-msgid "add a SAML service"
-msgstr "ajouter un service SAML"
+#: hiboo/service/templates/service_create.html:5
+#, python-format
+msgid "add a %(protocol_name)s service"
+msgstr ""
 
 #: hiboo/service/templates/service_details.html:5
 #, fuzzy
 msgid "service details"
 msgstr "Détails du service"
 
-#: hiboo/service/templates/service_details.html:19
-msgid "UUID"
-msgstr "UUID"
-
 #: hiboo/service/templates/service_details.html:31
-msgid "Edit this service"
+msgid "View profiles"
 msgstr ""
 
 #: hiboo/service/templates/service_details.html:32
+msgid "Edit this service"
+msgstr ""
+
+#: hiboo/service/templates/service_details.html:33
 msgid "Delete this service"
 msgstr ""
 
+#: hiboo/service/templates/service_edit.html:3
+msgid "Edit a service"
+msgstr ""
+
 #: hiboo/service/templates/service_list.html:3
 msgid "Service list"
 msgstr "Liste de services"
@@ -385,16 +483,16 @@ msgstr "Liste de services"
 msgid "all available services"
 msgstr "tous les services disponibles"
 
-#: hiboo/service/templates/service_list.html:13
-msgid "Service"
-msgstr "Service"
-
 #: hiboo/service/templates/service_list.html:15
+msgid "Type"
+msgstr ""
+
+#: hiboo/service/templates/service_list.html:16
 #, fuzzy
 msgid "Policy"
 msgstr "Règles"
 
-#: hiboo/service/templates/service_list.html:16
+#: hiboo/service/templates/service_list.html:17
 msgid "Max profiles"
 msgstr ""
 
@@ -406,12 +504,92 @@ msgstr ""
 msgid "SP ACS"
 msgstr ""
 
+#: hiboo/sso/forms.py:11
+msgid "Signature mode"
+msgstr ""
+
+#: hiboo/sso/forms.py:12
+msgid "Sign the full response"
+msgstr ""
+
+#: hiboo/sso/forms.py:13
+msgid "Sign only the assertion"
+msgstr ""
+
+#: hiboo/sso/forms.py:20
+msgid "Redirect URI"
+msgstr ""
+
+#: hiboo/sso/forms.py:22
+msgid "Token Endpoint Auth Method"
+msgstr ""
+
+#: hiboo/sso/forms.py:23
+msgid "HTTP POST data"
+msgstr ""
+
+#: hiboo/sso/forms.py:24
+msgid "HTTP basic authorization"
+msgstr ""
+
+#: hiboo/sso/forms.py:25
+msgid "No authentication"
+msgstr ""
+
+#: hiboo/sso/forms.py:29
+msgid "OpenID Connect grant type"
+msgstr ""
+
+#: hiboo/sso/forms.py:30
+msgid "Authorization Code"
+msgstr ""
+
+#: hiboo/sso/forms.py:31
+msgid "Implicit"
+msgstr ""
+
+#: hiboo/sso/forms.py:32
+msgid "Hybrid"
+msgstr ""
+
+#: hiboo/sso/forms.py:36
+msgid "Allowed response types"
+msgstr ""
+
+#: hiboo/sso/forms.py:37
+msgid "Authorization code only"
+msgstr ""
+
+#: hiboo/sso/forms.py:38
+msgid "Id token only"
+msgstr ""
+
+#: hiboo/sso/forms.py:39
+msgid "Id token and token"
+msgstr ""
+
 #: hiboo/sso/templates/protocol_oidc.html:2
 msgid ""
 "OpenID Connect (OIDC) is JWT based authentication and authorization "
 "protocol"
 msgstr ""
 
+#: hiboo/sso/templates/protocol_oidc.html:5
+msgid "Authorization endpoint"
+msgstr ""
+
+#: hiboo/sso/templates/protocol_oidc.html:8
+msgid "Token endpoint"
+msgstr ""
+
+#: hiboo/sso/templates/protocol_oidc.html:11
+msgid "Client ID"
+msgstr ""
+
+#: hiboo/sso/templates/protocol_oidc.html:14
+msgid "Client secret"
+msgstr ""
+
 #: hiboo/sso/templates/protocol_saml.html:2
 msgid ""
 "SAML2 is a legacy protocol based on XML security. Only redirect/post "
@@ -475,7 +653,16 @@ msgstr "Aide"
 msgid "Hiboo is free software distributed under the MIT license"
 msgstr "Si vous souhaitez contribuer aux messages d'aide, merci de nous contacter"
 
-#: hiboo/templates/macros.html:51
+#: hiboo/templates/confirm.html:3
+msgid "Confirm your action"
+msgstr ""
+
+#: hiboo/templates/confirm.html:8
+#, python-format
+msgid "Your are about to %(action)s. Do you wish to confirm that action?"
+msgstr ""
+
+#: hiboo/templates/macros.html:53
 msgid "Close"
 msgstr "Fermer"
 
@@ -492,16 +679,36 @@ msgid "Services"
 msgstr "Services"
 
 #: hiboo/templates/sidebar.html:40
+msgid "Users"
+msgstr ""
+
+#: hiboo/templates/sidebar.html:45
 msgid "About"
 msgstr "A propos"
 
-#: hiboo/templates/sidebar.html:43
+#: hiboo/templates/sidebar.html:48
 msgid "User guide"
 msgstr "Guide utilisateur"
 
-#: hiboo/templates/sidebar.html:48
+#: hiboo/templates/sidebar.html:53
 msgid "Admin guide"
 msgstr "Guide pour administrateur"
 
+#: hiboo/user/templates/user_details.html:4
+msgid "user details"
+msgstr ""
+
+#: hiboo/user/templates/user_list.html:3
+msgid "Manage users"
+msgstr ""
+
+#: hiboo/user/templates/user_pick.html:3
+msgid "Pick a user"
+msgstr ""
+
 #~ msgid "Welcome to Hiboo!"
 #~ msgstr "Bienvenue sur Hiboo !"
+
+#~ msgid "add a SAML service"
+#~ msgstr "ajouter un service SAML"
+
diff --git a/hiboo/translations/nl/LC_MESSAGES/messages.po b/hiboo/translations/nl/LC_MESSAGES/messages.po
index fab79ba472d3eb3ad08db5c445f1f0cbe646be1c..2e78139aa3cdbdfa29003642c0d551c5cf9c6a6d 100644
--- a/hiboo/translations/nl/LC_MESSAGES/messages.po
+++ b/hiboo/translations/nl/LC_MESSAGES/messages.po
@@ -7,56 +7,67 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-10-20 22:28+0200\n"
+"POT-Creation-Date: 2019-11-13 22:27+0100\n"
 "PO-Revision-Date: 2019-11-13 22:18+0100\n"
+"Last-Translator: \n"
 "Language: nl\n"
 "Language-Team: en <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
-"Last-Translator: \n"
-"X-Generator: Poedit 2.2.4\n"
 
-#: hiboo/models.py:150
+#: hiboo/models.py:153
 msgid "Profile creation is impossible"
 msgstr "Profiel maken is onmogelijk"
 
-#: hiboo/models.py:151
+#: hiboo/models.py:154
 msgid "Profile creation is reserved to managers"
 msgstr "Het maken van profielen is voorbehouden aan managers"
 
-#: hiboo/models.py:152
+#: hiboo/models.py:155
 msgid "Profile creation must be validated"
 msgstr "Het maken van profielen moet worden gevalideerd"
 
-#: hiboo/models.py:153
+#: hiboo/models.py:156
 msgid "Additional profiles must be validated"
 msgstr "Aanvullende profielen moeten worden gevalideerd"
 
-#: hiboo/models.py:154
+#: hiboo/models.py:157
 msgid "No validation is required"
 msgstr "Geen validatie vereist"
 
-#: hiboo/models.py:213
+#: hiboo/models.py:218
 msgid "signed up for this account"
 msgstr "aangemeld voor dit account"
 
-#: hiboo/models.py:214
+#: hiboo/models.py:219
 msgid "created the profile {this.profile.username} on {this.service.name}"
-msgstr ""
-"heeft het profiel {this.profile.username} gemaakt op {this.service.name}"
+msgstr "heeft het profiel {this.profile.username} gemaakt op {this.service.name}"
 
-#: hiboo/models.py:215
+#: hiboo/models.py:220
 msgid "changed your password"
 msgstr "wachtwoord veranderd"
 
-#: hiboo/account/forms.py:8 hiboo/account/forms.py:14 hiboo/account/forms.py:34
+#: hiboo/models.py:221
+msgid "{this.value} the profile {this.profile.username} on {this.service.name}"
+msgstr ""
+
+#: hiboo/security.py:48
+msgid "Confirm"
+msgstr ""
+
+#: hiboo/account/forms.py:8 hiboo/account/forms.py:14 hiboo/profile/forms.py:8
+#: hiboo/profile/forms.py:18 hiboo/profile/templates/profile_details.html:12
+#: hiboo/user/templates/user_details.html:12
+#: hiboo/user/templates/user_details.html:35
+#: hiboo/user/templates/user_list.html:12
+#: hiboo/user/templates/user_pick.html:12
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: hiboo/account/forms.py:9 hiboo/account/forms.py:19
+#: hiboo/account/forms.py:9 hiboo/account/forms.py:19 hiboo/profile/forms.py:19
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -69,8 +80,7 @@ msgstr "Aanmelden"
 msgid "Confirm password"
 msgstr "Bevestig wachtwoord"
 
-#: hiboo/account/forms.py:22 hiboo/account/forms.py:44
-#: hiboo/account/templates/account_signin.html:20
+#: hiboo/account/forms.py:22 hiboo/account/templates/account_signin.html:20
 #: hiboo/account/templates/account_signup.html:3
 #: hiboo/templates/sidebar.html:21
 msgid "Sign up"
@@ -92,14 +102,6 @@ msgstr "Bevestig nieuw wachtwoord"
 msgid "Change password"
 msgstr "Wachtwoord wijzigen"
 
-#: hiboo/account/forms.py:35
-msgid "Comment"
-msgstr "Commentaar"
-
-#: hiboo/account/forms.py:36
-msgid "Create profile"
-msgstr "Maak een profiel aan"
-
 #: hiboo/account/templates/account_home.html:3 hiboo/templates/sidebar.html:5
 msgid "My account"
 msgstr "Mijn rekening"
@@ -118,19 +120,20 @@ msgstr "Welkom bij Hiboo"
 
 #: hiboo/account/templates/account_signin.html:9
 msgid ""
-"<strong>You were directed to Hiboo for authentication</strong>. Hiboo is our "
-"account manager, made so you only have to remember a single password."
+"<strong>You were directed to Hiboo for authentication</strong>. Hiboo is "
+"our account manager, made so you only have to remember a single password."
 msgstr ""
-"<strong> U werd doorgestuurd naar Hiboo voor authenticatie </strong>. Hiboo "
-"is onze accountmanager, dus u hoeft maar één wachtwoord te onthouden."
+"<strong> U werd doorgestuurd naar Hiboo voor authenticatie </strong>. "
+"Hiboo is onze accountmanager, dus u hoeft maar één wachtwoord te "
+"onthouden."
 
 #: hiboo/account/templates/account_signin.html:10
 msgid ""
 "Hiboo handles accounts for our services and allows you to own multiple "
 "profiles on each service."
 msgstr ""
-"Hiboo verwerkt accounts voor onze services en stelt u in staat om voor elke "
-"service meerdere profielen te hebben."
+"Hiboo verwerkt accounts voor onze services en stelt u in staat om voor "
+"elke service meerdere profielen te hebben."
 
 #: hiboo/account/templates/account_signin.html:11
 msgid ""
@@ -138,17 +141,18 @@ msgid ""
 "(which is very probable if this is your first time here), please sign up "
 "first."
 msgstr ""
-"U kunt zich nu aanmelden bij uw Hiboo-account. Als je er nog geen hebt (wat "
-"zeer waarschijnlijk is als dit je eerste keer hier is), meld je dan eerst "
-"aan."
+"U kunt zich nu aanmelden bij uw Hiboo-account. Als je er nog geen hebt "
+"(wat zeer waarschijnlijk is als dit je eerste keer hier is), meld je dan "
+"eerst aan."
 
 #: hiboo/account/templates/account_signin.html:12
 msgid ""
-"If you already have a profile on the service you are authenticating for, no "
-"panic necessary: you will be able to claim it once logged into Hiboo!"
+"If you already have a profile on the service you are authenticating for, "
+"no panic necessary: you will be able to claim it once logged into Hiboo!"
 msgstr ""
-"Als u al een profiel hebt voor de service waarvoor u authenticeert, hoeft u "
-"niet in paniek te raken: u kunt dit claimen zodra u bent aangemeld bij Hiboo!"
+"Als u al een profiel hebt voor de service waarvoor u authenticeert, hoeft"
+" u niet in paniek te raken: u kunt dit claimen zodra u bent aangemeld bij"
+" Hiboo!"
 
 #: hiboo/account/templates/account_signup.html:4
 msgid "for a new account"
@@ -164,33 +168,33 @@ msgstr "Je staat op het punt je aan te melden voor een nieuw Hiboo-account."
 
 #: hiboo/account/templates/account_signup.html:10
 msgid ""
-"First, please note that you should only need one Hiboo account. If you own "
-"one already, please use it. If you need a profile with a different username, "
-"Hiboo makes it possible with a single account! Please contact us if you are "
-"having trouble."
+"First, please note that you should only need one Hiboo account. If you "
+"own one already, please use it. If you need a profile with a different "
+"username, Hiboo makes it possible with a single account! Please contact "
+"us if you are having trouble."
 msgstr ""
-"Merk eerst op dat u slechts één Hiboo-account nodig heeft. Als u er al een "
-"bezit, gebruik deze dan. Als je een profiel met een andere gebruikersnaam "
-"nodig hebt, maakt Hiboo het mogelijk met een enkel account! Neem contact met "
-"ons op als u problemen ondervindt."
+"Merk eerst op dat u slechts één Hiboo-account nodig heeft. Als u er al "
+"een bezit, gebruik deze dan. Als je een profiel met een andere "
+"gebruikersnaam nodig hebt, maakt Hiboo het mogelijk met een enkel "
+"account! Neem contact met ons op als u problemen ondervindt."
 
 #: hiboo/account/templates/account_signup.html:11
 msgid ""
-"The username that you are about to choose will be your Hiboo username and "
-"cannot be changed later. It does not have to be identical to your name on "
-"every service, you will be free to create profiles under any pseudonyme you "
-"want (if avaiable)."
+"The username that you are about to choose will be your Hiboo username and"
+" cannot be changed later. It does not have to be identical to your name "
+"on every service, you will be free to create profiles under any "
+"pseudonyme you want (if avaiable)."
 msgstr ""
-"De gebruikersnaam die u gaat kiezen, is uw Hiboo-gebruikersnaam en kan later "
-"niet worden gewijzigd. Het hoeft niet voor elke service identiek te zijn aan "
-"uw naam, u kunt profielen maken onder elke gewenste pseudoniem (indien "
-"beschikbaar)."
+"De gebruikersnaam die u gaat kiezen, is uw Hiboo-gebruikersnaam en kan "
+"later niet worden gewijzigd. Het hoeft niet voor elke service identiek te"
+" zijn aan uw naam, u kunt profielen maken onder elke gewenste pseudoniem "
+"(indien beschikbaar)."
 
 #: hiboo/account/templates/account_signup.html:12
 msgid ""
-"Please (please!) use a decent password and memorize it. We do not wish to "
-"collect data on who you are. That also means it is dificult for us to verify "
-"who you are and reset your password."
+"Please (please!) use a decent password and memorize it. We do not wish to"
+" collect data on who you are. That also means it is dificult for us to "
+"verify who you are and reset your password."
 msgstr ""
 "Gebruik alsjeblieft een goed wachtwoord en onthoud het. We willen geen "
 "gegevens verzamelen over wie je bent. Dat betekent ook dat het voor ons "
@@ -199,138 +203,227 @@ msgstr ""
 
 #: hiboo/account/templates/account_signup.html:13
 msgid ""
-"This username might be used directly on certain services though (where you "
-"are only allowed a single profile), in which case you will be notified first."
+"This username might be used directly on certain services though (where "
+"you are only allowed a single profile), in which case you will be "
+"notified first."
 msgstr ""
-"Deze gebruikersnaam kan echter direct worden gebruikt voor bepaalde services "
-"(waarbij u slechts één profiel mag gebruiken), in welk geval u eerst op de "
-"hoogte wordt gebracht."
+"Deze gebruikersnaam kan echter direct worden gebruikt voor bepaalde "
+"services (waarbij u slechts één profiel mag gebruiken), in welk geval u "
+"eerst op de hoogte wordt gebracht."
 
-#: hiboo/account/templates/profile_create.html:4
-msgid "New profile"
-msgstr "Nieuw profiel"
+#: hiboo/profile/forms.py:9
+msgid "Comment"
+msgstr "Commentaar"
+
+#: hiboo/profile/forms.py:10
+msgid "Create profile"
+msgstr "Maak een profiel aan"
 
-#: hiboo/account/templates/profile_create.html:5
-#: hiboo/account/templates/profile_pick.html:7
+#: hiboo/profile/forms.py:20 hiboo/profile/templates/profile_claim.html:4
+msgid "Claim profile"
+msgstr ""
+
+#: hiboo/profile/templates/profile_claim.html:5
+#: hiboo/profile/templates/profile_create.html:6
+#: hiboo/profile/templates/profile_pick.html:7
 #, python-format
 msgid "for the service %(service_name)s"
 msgstr "voor de service %(service_name)s"
 
-#: hiboo/account/templates/profile_create.html:9
-msgid "Create a new profile"
-msgstr "Maak een nieuw profiel aan"
+#: hiboo/profile/templates/profile_claim.html:9
+msgid "Claim an existing profile"
+msgstr ""
 
-#: hiboo/account/templates/profile_create.html:10
+#: hiboo/profile/templates/profile_claim.html:10
+#: hiboo/profile/templates/profile_create.html:13
 msgid "You are about to create your first profile."
 msgstr "U staat op het punt uw eerste profiel te maken."
 
-#: hiboo/account/templates/profile_create.html:11
+#: hiboo/profile/templates/profile_claim.html:11
+#: hiboo/profile/templates/profile_create.html:14
 msgid ""
-"Please choose a username wisely, you will not be able to change it later. "
-"You may pick anything that is valid for the service, as long as it is "
+"Please choose a username wisely, you will not be able to change it later."
+" You may pick anything that is valid for the service, as long as it is "
 "available."
 msgstr ""
-"Kies een gebruikersnaam verstandig, u kunt deze later niet meer wijzigen. U "
-"kunt alles kiezen dat geldig is voor de service, zolang deze beschikbaar is."
+"Kies een gebruikersnaam verstandig, u kunt deze later niet meer wijzigen."
+" U kunt alles kiezen dat geldig is voor de service, zolang deze "
+"beschikbaar is."
 
-#: hiboo/account/templates/profile_create.html:12
+#: hiboo/profile/templates/profile_claim.html:12
+#: hiboo/profile/templates/profile_create.html:15
 msgid ""
 "If your profile request is submitted for validation, please add a useful "
-"comment that will help us validate (describe shortly what your profile is "
-"for or why you need one)."
+"comment that will help us validate (describe shortly what your profile is"
+" for or why you need one)."
+msgstr ""
+"Als uw profielverzoek wordt ingediend voor validatie, voeg dan een "
+"nuttige opmerking toe die ons helpt te valideren (beschrijf kort waarvoor"
+" uw profiel is of waarom u er een nodig hebt)."
+
+#: hiboo/profile/templates/profile_create.html:4
+msgid "New profile"
+msgstr "Nieuw profiel"
+
+#: hiboo/profile/templates/profile_create.html:7
+msgid "and user"
+msgstr ""
+
+#: hiboo/profile/templates/profile_create.html:12
+msgid "Create a new profile"
+msgstr "Maak een nieuw profiel aan"
+
+#: hiboo/profile/templates/profile_details.html:4
+msgid "profile details"
+msgstr ""
+
+#: hiboo/profile/templates/profile_details.html:15
+msgid "Owner"
+msgstr ""
+
+#: hiboo/profile/templates/profile_details.html:18
+#: hiboo/service/templates/service_details.html:19
+#: hiboo/user/templates/user_details.html:15
+msgid "UUID"
+msgstr "UUID"
+
+#: hiboo/profile/templates/profile_details.html:21
+#: hiboo/profile/templates/profile_list.html:20
+#: hiboo/user/templates/user_details.html:36
+msgid "Status"
 msgstr ""
-"Als uw profielverzoek wordt ingediend voor validatie, voeg dan een nuttige "
-"opmerking toe die ons helpt te valideren (beschrijf kort waarvoor uw profiel "
-"is of waarom u er een nodig hebt)."
 
-#: hiboo/account/templates/profile_pick.html:6
+#: hiboo/profile/templates/profile_details.html:24
+#: hiboo/user/templates/user_details.html:18
+msgid "Created at"
+msgstr ""
+
+#: hiboo/profile/templates/profile_details.html:40
+msgid "Block profile"
+msgstr ""
+
+#: hiboo/profile/templates/profile_details.html:42
+msgid "Unblock profile"
+msgstr ""
+
+#: hiboo/profile/templates/profile_list.html:16
+#: hiboo/service/templates/service_list.html:13
+#: hiboo/user/templates/user_details.html:34
+msgid "Service"
+msgstr "Service"
+
+#: hiboo/profile/templates/profile_list.html:18
+msgid "Profile username"
+msgstr ""
+
+#: hiboo/profile/templates/profile_list.html:19
+msgid "Owned by"
+msgstr ""
+
+#: hiboo/profile/templates/profile_list.html:21
+#: hiboo/user/templates/user_list.html:13
+#: hiboo/user/templates/user_pick.html:13
+msgid "Created on"
+msgstr ""
+
+#: hiboo/profile/templates/profile_list.html:22
+#: hiboo/service/templates/service_list.html:18
+msgid "Actions"
+msgstr ""
+
+#: hiboo/profile/templates/profile_list.html:50
+msgid "Create a profile"
+msgstr ""
+
+#: hiboo/profile/templates/profile_pick.html:6
 msgid "Pick a profile"
 msgstr "Kies een profiel"
 
-#: hiboo/account/templates/profile_pick.html:22
+#: hiboo/profile/templates/profile_pick.html:22
 msgid "Blocked"
 msgstr "Geblokkeerd"
 
-#: hiboo/account/templates/profile_pick.html:24
+#: hiboo/profile/templates/profile_pick.html:24
 msgid "Awaiting approval"
 msgstr "In afwachting van goedkeuring"
 
-#: hiboo/account/templates/profile_pick.html:32
+#: hiboo/profile/templates/profile_pick.html:32
 #, python-format
 msgid "Created on %(created_on)s"
 msgstr "Gemaakt op %(created_on)s"
 
-#: hiboo/account/templates/profile_pick.html:33
+#: hiboo/profile/templates/profile_pick.html:33
 msgid "Not shared with anyone"
 msgstr "Met niemand gedeeld"
 
-#: hiboo/account/templates/profile_pick.html:41
+#: hiboo/profile/templates/profile_pick.html:41
 msgid "Here come profiles!"
 msgstr "Hier komen profielen!"
 
-#: hiboo/account/templates/profile_pick.html:43
+#: hiboo/profile/templates/profile_pick.html:43
 msgid ""
-"This service relies on profiles, which are just as many identities that you "
-"can have with your single Hiboo account."
+"This service relies on profiles, which are just as many identities that "
+"you can have with your single Hiboo account."
 msgstr ""
-"Deze service is gebaseerd op profielen, die evenveel identiteiten zijn die u "
-"kunt hebben met uw enkele Hiboo-account."
+"Deze service is gebaseerd op profielen, die evenveel identiteiten zijn "
+"die u kunt hebben met uw enkele Hiboo-account."
 
-#: hiboo/account/templates/profile_pick.html:44
+#: hiboo/profile/templates/profile_pick.html:44
 msgid ""
 "You may think of profiles as a way to have both a personal and an "
-"organization account, or to use the service under different identities for "
-"diffrent activities."
+"organization account, or to use the service under different identities "
+"for diffrent activities."
 msgstr ""
-"U kunt profielen beschouwen als een manier om zowel een persoonlijk account "
-"als een bedrijfsaccount te hebben of om de service onder verschillende "
-"identiteiten te gebruiken voor verschillende activiteiten."
+"U kunt profielen beschouwen als een manier om zowel een persoonlijk "
+"account als een bedrijfsaccount te hebben of om de service onder "
+"verschillende identiteiten te gebruiken voor verschillende activiteiten."
 
-#: hiboo/account/templates/profile_pick.html:45
+#: hiboo/profile/templates/profile_pick.html:45
 msgid ""
-"Profiles were introduced in order to offer flexibility and security against "
-"stalkers and other sorts of online violence."
+"Profiles were introduced in order to offer flexibility and security "
+"against stalkers and other sorts of online violence."
 msgstr ""
 "Profielen werden geïntroduceerd om flexibiliteit en veiligheid te bieden "
 "tegen stalkers en andere vormen van online geweld."
 
-#: hiboo/account/templates/profile_pick.html:48
+#: hiboo/profile/templates/profile_pick.html:48
 msgid ""
-"However, profile creation on this services are currently locked down. You "
-"may only use existing profiles if you have some."
+"However, profile creation on this services are currently locked down. You"
+" may only use existing profiles if you have some."
 msgstr ""
-"Het maken van profielen op deze services is momenteel echter vergrendeld. Je "
-"mag alleen bestaande profielen gebruiken als je er een hebt."
+"Het maken van profielen op deze services is momenteel echter vergrendeld."
+" Je mag alleen bestaande profielen gebruiken als je er een hebt."
 
-#: hiboo/account/templates/profile_pick.html:50
+#: hiboo/profile/templates/profile_pick.html:50
 msgid ""
-"This service is not currently open for profile registration. In order to get "
-"new profiles, you must ask a service administrator."
+"This service is not currently open for profile registration. In order to "
+"get new profiles, you must ask a service administrator."
 msgstr ""
 "Deze service is momenteel niet open voor profielregistratie. Om nieuwe "
 "profielen te krijgen, moet u een servicebeheerder vragen."
 
-#: hiboo/account/templates/profile_pick.html:52
+#: hiboo/profile/templates/profile_pick.html:52
 msgid ""
-"You may request new profiles. Your requests will be submitted to validation."
+"You may request new profiles. Your requests will be submitted to "
+"validation."
 msgstr ""
 "U kunt nieuwe profielen aanvragen. Uw verzoeken worden ter validatie "
 "ingediend."
 
-#: hiboo/account/templates/profile_pick.html:54
+#: hiboo/profile/templates/profile_pick.html:54
 #, python-format
 msgid ""
 "You may create up to %(max_profiles)s profiles. Further profile requests "
 "will be submitted to validation."
 msgstr ""
-"U kunt maximaal %(max_profiles)s profielen maken. Verdere profielverzoeken "
-"worden ter validatie voorgelegd."
+"U kunt maximaal %(max_profiles)s profielen maken. Verdere "
+"profielverzoeken worden ter validatie voorgelegd."
 
-#: hiboo/account/templates/profile_pick.html:56
+#: hiboo/profile/templates/profile_pick.html:56
 #, python-format
 msgid ""
-"You may create up to %(max_profiles)s profiles. Please contact the service "
-"administrator if you have any specific needs."
+"You may create up to %(max_profiles)s profiles. Please contact the "
+"service administrator if you have any specific needs."
 msgstr ""
 "U kunt maximaal %(max_profiles)s profielen maken. Neem contact op met de "
 "servicebeheerder als u specifieke behoeften hebt."
@@ -359,44 +452,53 @@ msgstr "Profielbeleid"
 msgid "Maximum profile count"
 msgstr "Maximaal profielaantal"
 
-#: hiboo/service/forms.py:19 hiboo/sso/forms.py:10
+#: hiboo/service/forms.py:19
+msgid "Disable per-profile username"
+msgstr ""
+
+#: hiboo/service/forms.py:20 hiboo/sso/forms.py:16 hiboo/sso/forms.py:42
 msgid "Submit"
 msgstr "Voorleggen"
 
-#: hiboo/service/templates/service_create.html:3
-#: hiboo/service/templates/service_create_form.html:3
-#: hiboo/service/templates/service_list.html:34
+#: hiboo/service/templates/protocol_pick.html:3
+#: hiboo/service/templates/service_create.html:4
+#: hiboo/service/templates/service_list.html:42
 msgid "Create a service"
 msgstr "Maak een service aan"
 
-#: hiboo/service/templates/service_create.html:4
+#: hiboo/service/templates/protocol_pick.html:4
 msgid "pick a protocol"
 msgstr "kies een protocol"
 
-#: hiboo/service/templates/service_create.html:16
+#: hiboo/service/templates/protocol_pick.html:16
 msgid "Create "
 msgstr "Creëren "
 
-#: hiboo/service/templates/service_create_form.html:4
-msgid "add a SAML service"
-msgstr "voeg een SAML-service toe"
+#: hiboo/service/templates/service_create.html:5
+#, python-format
+msgid "add a %(protocol_name)s service"
+msgstr ""
 
 #: hiboo/service/templates/service_details.html:5
 msgid "service details"
 msgstr "service details"
 
-#: hiboo/service/templates/service_details.html:19
-msgid "UUID"
-msgstr "UUID"
-
 #: hiboo/service/templates/service_details.html:31
+msgid "View profiles"
+msgstr ""
+
+#: hiboo/service/templates/service_details.html:32
 msgid "Edit this service"
 msgstr "Bewerk deze service"
 
-#: hiboo/service/templates/service_details.html:32
+#: hiboo/service/templates/service_details.html:33
 msgid "Delete this service"
 msgstr "Verwijder deze service"
 
+#: hiboo/service/templates/service_edit.html:3
+msgid "Edit a service"
+msgstr ""
+
 #: hiboo/service/templates/service_list.html:3
 msgid "Service list"
 msgstr "Servicelijst"
@@ -405,15 +507,15 @@ msgstr "Servicelijst"
 msgid "all available services"
 msgstr "alle beschikbare services"
 
-#: hiboo/service/templates/service_list.html:13
-msgid "Service"
-msgstr "Service"
-
 #: hiboo/service/templates/service_list.html:15
+msgid "Type"
+msgstr ""
+
+#: hiboo/service/templates/service_list.html:16
 msgid "Policy"
 msgstr "Het beleid"
 
-#: hiboo/service/templates/service_list.html:16
+#: hiboo/service/templates/service_list.html:17
 msgid "Max profiles"
 msgstr "Max profielen"
 
@@ -425,20 +527,101 @@ msgstr "SP entiteits-ID"
 msgid "SP ACS"
 msgstr "SP ACS"
 
+#: hiboo/sso/forms.py:11
+msgid "Signature mode"
+msgstr ""
+
+#: hiboo/sso/forms.py:12
+msgid "Sign the full response"
+msgstr ""
+
+#: hiboo/sso/forms.py:13
+msgid "Sign only the assertion"
+msgstr ""
+
+#: hiboo/sso/forms.py:20
+msgid "Redirect URI"
+msgstr ""
+
+#: hiboo/sso/forms.py:22
+msgid "Token Endpoint Auth Method"
+msgstr ""
+
+#: hiboo/sso/forms.py:23
+msgid "HTTP POST data"
+msgstr ""
+
+#: hiboo/sso/forms.py:24
+msgid "HTTP basic authorization"
+msgstr ""
+
+#: hiboo/sso/forms.py:25
+msgid "No authentication"
+msgstr ""
+
+#: hiboo/sso/forms.py:29
+msgid "OpenID Connect grant type"
+msgstr ""
+
+#: hiboo/sso/forms.py:30
+msgid "Authorization Code"
+msgstr ""
+
+#: hiboo/sso/forms.py:31
+msgid "Implicit"
+msgstr ""
+
+#: hiboo/sso/forms.py:32
+msgid "Hybrid"
+msgstr ""
+
+#: hiboo/sso/forms.py:36
+msgid "Allowed response types"
+msgstr ""
+
+#: hiboo/sso/forms.py:37
+msgid "Authorization code only"
+msgstr ""
+
+#: hiboo/sso/forms.py:38
+msgid "Id token only"
+msgstr ""
+
+#: hiboo/sso/forms.py:39
+msgid "Id token and token"
+msgstr ""
+
 #: hiboo/sso/templates/protocol_oidc.html:2
 msgid ""
-"OpenID Connect (OIDC) is JWT based authentication and authorization protocol"
+"OpenID Connect (OIDC) is JWT based authentication and authorization "
+"protocol"
 msgstr ""
 "OpenID Connect (OIDC) is een op JWT gebaseerd authenticatie- en "
 "autorisatieprotocol"
 
+#: hiboo/sso/templates/protocol_oidc.html:5
+msgid "Authorization endpoint"
+msgstr ""
+
+#: hiboo/sso/templates/protocol_oidc.html:8
+msgid "Token endpoint"
+msgstr ""
+
+#: hiboo/sso/templates/protocol_oidc.html:11
+msgid "Client ID"
+msgstr ""
+
+#: hiboo/sso/templates/protocol_oidc.html:14
+msgid "Client secret"
+msgstr ""
+
 #: hiboo/sso/templates/protocol_saml.html:2
 msgid ""
-"SAML2 is a legacy protocol based on XML security. Only redirect/post binding "
-"is supported."
+"SAML2 is a legacy protocol based on XML security. Only redirect/post "
+"binding is supported."
 msgstr ""
-"SAML2 is een oud protocol op basis van XML-beveiliging. Alleen redirect/post "
-"binding wordt ondersteund."
+"SAML2 is een oud protocol op basis van XML-beveiliging. Alleen "
+"redirect/post binding wordt ondersteund."
 
 #: hiboo/sso/templates/protocol_saml.html:5
 msgid "Endpoint"
@@ -474,8 +657,8 @@ msgstr "Korte SP persoonlijke sleutel"
 
 #: hiboo/sso/templates/sso_redirect.html:8
 msgid ""
-"Since your browser does not support JavaScript, you must press the button "
-"once to proceed."
+"Since your browser does not support JavaScript, you must press the button"
+" once to proceed."
 msgstr ""
 "Omdat uw browser JavaScript niet ondersteunt, moet u eenmaal op de knop "
 "drukken om door te gaan."
@@ -494,10 +677,18 @@ msgstr "Helpen"
 
 #: hiboo/templates/base.html:84
 msgid "Hiboo is free software distributed under the MIT license"
+msgstr "Hiboo is gratis software die wordt gedistribueerd onder de MIT-licentie"
+
+#: hiboo/templates/confirm.html:3
+msgid "Confirm your action"
 msgstr ""
-"Hiboo is gratis software die wordt gedistribueerd onder de MIT-licentie"
 
-#: hiboo/templates/macros.html:51
+#: hiboo/templates/confirm.html:8
+#, python-format
+msgid "Your are about to %(action)s. Do you wish to confirm that action?"
+msgstr ""
+
+#: hiboo/templates/macros.html:53
 msgid "Close"
 msgstr "Dichtbij"
 
@@ -514,13 +705,33 @@ msgid "Services"
 msgstr "Diensten"
 
 #: hiboo/templates/sidebar.html:40
+msgid "Users"
+msgstr ""
+
+#: hiboo/templates/sidebar.html:45
 msgid "About"
 msgstr "Over"
 
-#: hiboo/templates/sidebar.html:43
+#: hiboo/templates/sidebar.html:48
 msgid "User guide"
 msgstr "Gebruikershandleiding"
 
-#: hiboo/templates/sidebar.html:48
+#: hiboo/templates/sidebar.html:53
 msgid "Admin guide"
 msgstr "Admin gids"
+
+#: hiboo/user/templates/user_details.html:4
+msgid "user details"
+msgstr ""
+
+#: hiboo/user/templates/user_list.html:3
+msgid "Manage users"
+msgstr ""
+
+#: hiboo/user/templates/user_pick.html:3
+msgid "Pick a user"
+msgstr ""
+
+#~ msgid "add a SAML service"
+#~ msgstr "voeg een SAML-service toe"
+