diff --git a/hiboo/translations/en_US/LC_MESSAGES/messages.po b/hiboo/translations/en_US/LC_MESSAGES/messages.po
index 5d853a7d98f585060125c19f766dc3da22be3686..ecd984abfc6ff0c78a02b42bff37c0f610f04572 100644
--- a/hiboo/translations/en_US/LC_MESSAGES/messages.po
+++ b/hiboo/translations/en_US/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-11-13 22:27+0100\n"
+"POT-Creation-Date: 2019-11-21 23:53+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -19,39 +19,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: hiboo/models.py:153
+#: hiboo/models.py:152
 msgid "Profile creation is impossible"
 msgstr ""
 
-#: hiboo/models.py:154
+#: hiboo/models.py:153
 msgid "Profile creation is reserved to managers"
 msgstr ""
 
-#: hiboo/models.py:155
+#: hiboo/models.py:154
 msgid "Profile creation must be validated"
 msgstr ""
 
-#: hiboo/models.py:156
+#: hiboo/models.py:155
 msgid "Additional profiles must be validated"
 msgstr ""
 
-#: hiboo/models.py:157
+#: hiboo/models.py:156
 msgid "No validation is required"
 msgstr ""
 
-#: hiboo/models.py:218
+#: hiboo/models.py:217
 msgid "signed up for this account"
 msgstr ""
 
-#: hiboo/models.py:219
+#: hiboo/models.py:218
 msgid "created the profile {this.profile.username} on {this.service.name}"
 msgstr ""
 
-#: hiboo/models.py:220
+#: hiboo/models.py:219
 msgid "changed your password"
 msgstr ""
 
-#: hiboo/models.py:221
+#: hiboo/models.py:220
 msgid "{this.value} the profile {this.profile.username} on {this.service.name}"
 msgstr ""
 
@@ -73,7 +73,7 @@ msgid "Password"
 msgstr ""
 
 #: hiboo/account/forms.py:10 hiboo/account/templates/account_signin.html:3
-#: hiboo/templates/base.html:40 hiboo/templates/sidebar.html:26
+#: hiboo/templates/base.html:42 hiboo/templates/sidebar.html:31
 msgid "Sign in"
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr ""
 
 #: hiboo/account/forms.py:22 hiboo/account/templates/account_signin.html:20
 #: hiboo/account/templates/account_signup.html:3
-#: hiboo/templates/sidebar.html:21
+#: hiboo/templates/sidebar.html:26
 msgid "Sign up"
 msgstr ""
 
@@ -99,11 +99,13 @@ msgstr ""
 msgid "Confirm new password"
 msgstr ""
 
-#: hiboo/account/forms.py:30 hiboo/templates/sidebar.html:10
+#: hiboo/account/forms.py:30 hiboo/templates/sidebar.html:15
 msgid "Change password"
 msgstr ""
 
-#: hiboo/account/templates/account_home.html:3 hiboo/templates/sidebar.html:5
+#: hiboo/account/home.py:13 hiboo/account/templates/account_home.html:3
+#: hiboo/account/templates/account_profiles.html:3
+#: hiboo/templates/sidebar.html:5
 msgid "My account"
 msgstr ""
 
@@ -111,37 +113,72 @@ msgstr ""
 msgid "status and history"
 msgstr ""
 
+#: hiboo/account/templates/account_profiles.html:4
+msgid "my profiles"
+msgstr ""
+
+#: hiboo/account/templates/account_profiles.html:14
+#: 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/account/templates/account_profiles.html:16
+#: hiboo/profile/templates/profile_list.html:18
+msgid "Profile username"
+msgstr ""
+
+#: hiboo/account/templates/account_profiles.html:17
+#: hiboo/profile/templates/profile_list.html:19
+msgid "Owned by"
+msgstr ""
+
+#: hiboo/account/templates/account_profiles.html:18
+#: 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/account/templates/account_profiles.html:19
+#: 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/account/templates/account_signin.html:4
 msgid "to access your account"
 msgstr ""
 
 #: hiboo/account/templates/account_signin.html:8
-msgid "Welcome to Hiboo"
+msgid "Authentication manager"
 msgstr ""
 
 #: 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 redirected for authentication</strong>. This is our "
+"account manager, designed so you only have to authenticate once."
 msgstr ""
 
 #: hiboo/account/templates/account_signin.html:10
 msgid ""
-"Hiboo handles accounts for our services and allows you to own multiple "
+"It handles accounts for our services and allows you to own multiple "
 "profiles on each service."
 msgstr ""
 
 #: hiboo/account/templates/account_signin.html:11
 msgid ""
-"You can now sign in to your Hiboo account. If you do not own one already "
-"(which is very probable if this is your first time here), please sign up "
-"first."
+"You can now sign in to your account. If you do not own one already (which"
+" is probable if this is your first time here), please sign up first."
 msgstr ""
 
 #: 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 used to have an account on the application you are authenticating "
+"for, no panic necessary: you will be able to claim it once logged into "
+"Hiboo!"
 msgstr ""
 
 #: hiboo/account/templates/account_signup.html:4
@@ -153,23 +190,21 @@ msgid "I want a new account!"
 msgstr ""
 
 #: hiboo/account/templates/account_signup.html:9
-msgid "You are about to sign up for a new Hiboo account."
+msgid "You are about to sign up for a new account."
 msgstr ""
 
 #: 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 only need a single account. If you own one "
+"already, please sign in. If you need a different username, you can simply"
+" create additional profiles! Please contact us if you are having trouble."
 msgstr ""
 
 #: 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)."
+"Please chose your account name carefully, since you will not be able to "
+"change it later. You will then be able to create profiles under "
+"pseudonymes."
 msgstr ""
 
 #: hiboo/account/templates/account_signup.html:12
@@ -179,13 +214,6 @@ msgid ""
 "verify who you are and reset your password."
 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."
-msgstr ""
-
 #: hiboo/profile/forms.py:9
 msgid "Comment"
 msgstr ""
@@ -210,24 +238,19 @@ msgid "Claim an existing profile"
 msgstr ""
 
 #: hiboo/profile/templates/profile_claim.html:10
-#: hiboo/profile/templates/profile_create.html:13
-msgid "You are about to create your first profile."
+msgid "You are about to claim an existing profile on the service."
 msgstr ""
 
 #: 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."
+"Please specify the username and password of your original account on the "
+"service."
 msgstr ""
 
 #: 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)."
+"If you are used to sign into that service using an email address, please "
+"specify your username or nickname instead."
 msgstr ""
 
 #: hiboo/profile/templates/profile_create.html:4
@@ -242,6 +265,24 @@ msgstr ""
 msgid "Create a new profile"
 msgstr ""
 
+#: hiboo/profile/templates/profile_create.html:13
+msgid "You are about to create an application profile."
+msgstr ""
+
+#: 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/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/profile/templates/profile_details.html:4
 msgid "profile details"
 msgstr ""
@@ -256,12 +297,6 @@ msgstr ""
 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"
@@ -275,26 +310,6 @@ msgstr ""
 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"
@@ -332,14 +347,14 @@ msgstr ""
 #: 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."
+"you can have with your single account."
 msgstr ""
 
 #: 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."
+"You may think of profiles as a way to switch between a personal and a "
+"business account, or to use the service under different identities for "
+"diffrent activities."
 msgstr ""
 
 #: hiboo/profile/templates/profile_pick.html:45
@@ -572,34 +587,38 @@ msgid ""
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:5
-msgid "Endpoint"
+msgid "SAML Metadata"
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:8
-msgid "ACS"
+msgid "SSO redirect binding"
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:11
-msgid "IDP certificate"
+msgid "ACS"
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:14
-msgid "Short IDP certificate"
+msgid "IDP certificate"
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:17
-msgid ">SP certificate"
+msgid "Short IDP certificate"
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:20
-msgid "Short SP certificate"
+msgid ">SP certificate"
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:23
-msgid "SP private key"
+msgid "Short SP certificate"
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:26
+msgid "SP private key"
+msgstr ""
+
+#: hiboo/sso/templates/protocol_saml.html:29
 msgid "Short SP private key"
 msgstr ""
 
@@ -609,19 +628,19 @@ msgid ""
 " once to proceed."
 msgstr ""
 
-#: hiboo/templates/base.html:20
+#: hiboo/templates/base.html:22
 msgid "Toggle navigation"
 msgstr ""
 
-#: hiboo/templates/base.html:33 hiboo/templates/sidebar.html:15
+#: hiboo/templates/base.html:35 hiboo/templates/sidebar.html:20
 msgid "Sign out"
 msgstr ""
 
-#: hiboo/templates/base.html:47
+#: hiboo/templates/base.html:49
 msgid "Help"
 msgstr ""
 
-#: hiboo/templates/base.html:84
+#: hiboo/templates/base.html:86
 msgid "Hiboo is free software distributed under the MIT license"
 msgstr ""
 
@@ -642,27 +661,31 @@ msgstr ""
 msgid "Account"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:32
+#: hiboo/templates/sidebar.html:10
+msgid "My profiles"
+msgstr ""
+
+#: hiboo/templates/sidebar.html:37
 msgid "Admin"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:35
+#: hiboo/templates/sidebar.html:40
 msgid "Services"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:40
+#: hiboo/templates/sidebar.html:45
 msgid "Users"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:45
+#: hiboo/templates/sidebar.html:50
 msgid "About"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:48
+#: hiboo/templates/sidebar.html:53
 msgid "User guide"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:53
+#: hiboo/templates/sidebar.html:58
 msgid "Admin guide"
 msgstr ""
 
@@ -711,3 +734,89 @@ msgstr ""
 #~ msgid "add a SAML service"
 #~ msgstr ""
 
+#~ msgid "Welcome to Hiboo"
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Hiboo handles accounts for our services"
+#~ " and allows you to own multiple "
+#~ "profiles on each service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can now sign in to your "
+#~ "Hiboo account. If you do not own"
+#~ " one already (which is very probable"
+#~ " if this is your first time "
+#~ "here), please sign up first."
+#~ msgstr ""
+
+#~ 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!"
+#~ msgstr ""
+
+#~ msgid "You are about to sign up for a new Hiboo account."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
+#~ 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)."
+#~ msgstr ""
+
+#~ 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."
+#~ msgstr ""
+
+#~ msgid "You are about to create your first profile."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This service relies on profiles, which"
+#~ " are just as many identities that "
+#~ "you can have with your single "
+#~ "Hiboo account."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "Endpoint"
+#~ msgstr ""
+
diff --git a/hiboo/translations/fr_FR/LC_MESSAGES/messages.po b/hiboo/translations/fr_FR/LC_MESSAGES/messages.po
index a171f13ee729818254eec9fcc537907c83f60101..04e9a18d0de993ee69969158e0b78ad3f16c53fd 100644
--- a/hiboo/translations/fr_FR/LC_MESSAGES/messages.po
+++ b/hiboo/translations/fr_FR/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: 2019-11-13 22:27+0100\n"
+"POT-Creation-Date: 2019-11-21 23:53+0100\n"
 "PO-Revision-Date: 2019-10-20 18:31+0000\n"
 "Last-Translator: Angedestenebres <angedestenebres@tugaleres.com>\n"
 "Language: fr\n"
@@ -19,40 +19,40 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: hiboo/models.py:153
+#: hiboo/models.py:152
 msgid "Profile creation is impossible"
 msgstr "La création de profil est impossible"
 
-#: hiboo/models.py:154
+#: hiboo/models.py:153
 msgid "Profile creation is reserved to managers"
 msgstr "La création de profil est réservées aux managers"
 
-#: hiboo/models.py:155
+#: hiboo/models.py:154
 msgid "Profile creation must be validated"
 msgstr "La création de profil doit être validée"
 
-#: hiboo/models.py:156
+#: hiboo/models.py:155
 msgid "Additional profiles must be validated"
 msgstr "Les profils additionnels doivent être validés"
 
-#: hiboo/models.py:157
+#: hiboo/models.py:156
 msgid "No validation is required"
 msgstr "Aucune validation n'est requise"
 
-#: hiboo/models.py:218
+#: hiboo/models.py:217
 #, fuzzy
 msgid "signed up for this account"
 msgstr "Inscrit avec ce compte"
 
-#: hiboo/models.py:219
+#: hiboo/models.py:218
 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:220
+#: hiboo/models.py:219
 msgid "changed your password"
 msgstr "Votre mot de passe a été changé"
 
-#: hiboo/models.py:221
+#: hiboo/models.py:220
 msgid "{this.value} the profile {this.profile.username} on {this.service.name}"
 msgstr ""
 
@@ -74,7 +74,7 @@ msgid "Password"
 msgstr "Mot de passe"
 
 #: hiboo/account/forms.py:10 hiboo/account/templates/account_signin.html:3
-#: hiboo/templates/base.html:40 hiboo/templates/sidebar.html:26
+#: hiboo/templates/base.html:42 hiboo/templates/sidebar.html:31
 msgid "Sign in"
 msgstr "Se connecter"
 
@@ -84,7 +84,7 @@ msgstr "Confirmer le mot de passe"
 
 #: hiboo/account/forms.py:22 hiboo/account/templates/account_signin.html:20
 #: hiboo/account/templates/account_signup.html:3
-#: hiboo/templates/sidebar.html:21
+#: hiboo/templates/sidebar.html:26
 msgid "Sign up"
 msgstr "S'enregistrer"
 
@@ -100,11 +100,13 @@ msgstr "Nouveau mot de passe"
 msgid "Confirm new password"
 msgstr "Confirmer le nouveau mot de passe"
 
-#: hiboo/account/forms.py:30 hiboo/templates/sidebar.html:10
+#: hiboo/account/forms.py:30 hiboo/templates/sidebar.html:15
 msgid "Change password"
 msgstr "Changer le mot de passe"
 
-#: hiboo/account/templates/account_home.html:3 hiboo/templates/sidebar.html:5
+#: hiboo/account/home.py:13 hiboo/account/templates/account_home.html:3
+#: hiboo/account/templates/account_profiles.html:3
+#: hiboo/templates/sidebar.html:5
 msgid "My account"
 msgstr "Mon compte"
 
@@ -112,48 +114,73 @@ msgstr "Mon compte"
 msgid "status and history"
 msgstr "Statut et historique"
 
+#: hiboo/account/templates/account_profiles.html:4
+msgid "my profiles"
+msgstr ""
+
+#: hiboo/account/templates/account_profiles.html:14
+#: 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/account/templates/account_profiles.html:16
+#: hiboo/profile/templates/profile_list.html:18
+msgid "Profile username"
+msgstr ""
+
+#: hiboo/account/templates/account_profiles.html:17
+#: hiboo/profile/templates/profile_list.html:19
+msgid "Owned by"
+msgstr ""
+
+#: hiboo/account/templates/account_profiles.html:18
+#: 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/account/templates/account_profiles.html:19
+#: 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/account/templates/account_signin.html:4
 #, fuzzy
 msgid "to access your account"
 msgstr "Pour accéder à votre compte"
 
 #: hiboo/account/templates/account_signin.html:8
-msgid "Welcome to Hiboo"
-msgstr "Bienvenue sur Hiboo"
+msgid "Authentication manager"
+msgstr ""
 
 #: 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 redirected for authentication</strong>. This is our "
+"account manager, designed so you only have to authenticate once."
 msgstr ""
-"<strong>Vous avez été redirigé vers Hiboo pour vous "
-"authentifier</strong>. Hiboo est votre gestionnaire de comptes qui vous "
-"permet de n'avoir qu'un seul mot de passe à retenir."
 
 #: hiboo/account/templates/account_signin.html:10
-#, fuzzy
 msgid ""
-"Hiboo handles accounts for our services and allows you to own multiple "
+"It handles accounts for our services and allows you to own multiple "
 "profiles on each service."
 msgstr ""
-"Hiboo gère les comptes pour nos services et vous permet d'avoir plusieurs"
-" profils pour chaque service."
 
 #: hiboo/account/templates/account_signin.html:11
-#, fuzzy
 msgid ""
-"You can now sign in to your Hiboo account. If you do not own one already "
-"(which is very probable if this is your first time here), please sign up "
-"first."
+"You can now sign in to your account. If you do not own one already (which"
+" is probable if this is your first time here), please sign up first."
 msgstr ""
-"Vous pouvez maintenant vous connecter à votre compte Hiboo. Si vous n'en "
-"possédez pas déjà un (ce qui est très probable si c'est la première fois "
-"que vous venez ici), veuillez alors vous enregistrer."
 
 #: 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 used to have an account on the application you are authenticating "
+"for, no panic necessary: you will be able to claim it once logged into "
+"Hiboo!"
 msgstr ""
 
 #: hiboo/account/templates/account_signup.html:4
@@ -166,34 +193,22 @@ msgid "I want a new account!"
 msgstr "Je veux un nouveau compte"
 
 #: hiboo/account/templates/account_signup.html:9
-msgid "You are about to sign up for a new Hiboo account."
-msgstr "Vous vous apprêtez à vous enregistrer avec un nouveau compte Hiboo."
+msgid "You are about to sign up for a new account."
+msgstr ""
 
 #: 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 only need a single account. If you own one "
+"already, please sign in. If you need a different username, you can simply"
+" create additional profiles! Please contact us if you are having trouble."
 msgstr ""
-"En premier lieu, veuillez noter qu'un seul compte Hiboo suffit. Si vous "
-"en avez déjà un, veuillez l'utiliser. Si vous avez besoin d'un profil "
-"avec un nom d'utilisateur différent, cela est possible avec un seul "
-"compte Hiboo ! Veuillez nous contacter en cas de problème."
 
 #: hiboo/account/templates/account_signup.html:11
-#, fuzzy
 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)."
+"Please chose your account name carefully, since you will not be able to "
+"change it later. You will then be able to create profiles under "
+"pseudonymes."
 msgstr ""
-"Le nom d'utilisateur que vous vous apprêtez à choisir sera le nom de "
-"votre compte Hiboo et ne pourra pas être changé plus tard. Il n'est pas "
-"nécessaire qu'il soit identique à votre nom sur chaque service, vous "
-"serez libre de créer un profil avec le pseudo que vous désirez (si "
-"disponible)."
 
 #: hiboo/account/templates/account_signup.html:12
 msgid ""
@@ -202,13 +217,6 @@ msgid ""
 "verify who you are and reset your password."
 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."
-msgstr ""
-
 #: hiboo/profile/forms.py:9
 msgid "Comment"
 msgstr "Commentaire"
@@ -233,24 +241,19 @@ msgid "Claim an existing profile"
 msgstr ""
 
 #: 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."
+msgid "You are about to claim an existing profile on the service."
+msgstr ""
 
 #: 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."
+"Please specify the username and password of your original account on the "
+"service."
 msgstr ""
 
 #: 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)."
+"If you are used to sign into that service using an email address, please "
+"specify your username or nickname instead."
 msgstr ""
 
 #: hiboo/profile/templates/profile_create.html:4
@@ -265,6 +268,24 @@ msgstr ""
 msgid "Create a new profile"
 msgstr "Créer un nouveau profil"
 
+#: hiboo/profile/templates/profile_create.html:13
+msgid "You are about to create an application profile."
+msgstr ""
+
+#: 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/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/profile/templates/profile_details.html:4
 msgid "profile details"
 msgstr ""
@@ -279,12 +300,6 @@ msgstr ""
 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"
@@ -298,26 +313,6 @@ msgstr ""
 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"
@@ -355,14 +350,14 @@ msgstr ""
 #: 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."
+"you can have with your single account."
 msgstr ""
 
 #: 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."
+"You may think of profiles as a way to switch between a personal and a "
+"business account, or to use the service under different identities for "
+"diffrent activities."
 msgstr ""
 
 #: hiboo/profile/templates/profile_pick.html:45
@@ -597,34 +592,38 @@ msgid ""
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:5
-msgid "Endpoint"
+msgid "SAML Metadata"
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:8
-msgid "ACS"
+msgid "SSO redirect binding"
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:11
-msgid "IDP certificate"
+msgid "ACS"
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:14
-msgid "Short IDP certificate"
+msgid "IDP certificate"
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:17
-msgid ">SP certificate"
+msgid "Short IDP certificate"
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:20
-msgid "Short SP certificate"
+msgid ">SP certificate"
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:23
-msgid "SP private key"
+msgid "Short SP certificate"
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:26
+msgid "SP private key"
+msgstr ""
+
+#: hiboo/sso/templates/protocol_saml.html:29
 msgid "Short SP private key"
 msgstr ""
 
@@ -637,19 +636,19 @@ msgstr ""
 "Vu que votre navigateur n'est supporte pas JavaScript, vous devez appuyer"
 " sur pour continuer."
 
-#: hiboo/templates/base.html:20
+#: hiboo/templates/base.html:22
 msgid "Toggle navigation"
 msgstr ""
 
-#: hiboo/templates/base.html:33 hiboo/templates/sidebar.html:15
+#: hiboo/templates/base.html:35 hiboo/templates/sidebar.html:20
 msgid "Sign out"
 msgstr "Se déconnecter"
 
-#: hiboo/templates/base.html:47
+#: hiboo/templates/base.html:49
 msgid "Help"
 msgstr "Aide"
 
-#: hiboo/templates/base.html:84
+#: hiboo/templates/base.html:86
 msgid "Hiboo is free software distributed under the MIT license"
 msgstr "Si vous souhaitez contribuer aux messages d'aide, merci de nous contacter"
 
@@ -670,27 +669,31 @@ msgstr "Fermer"
 msgid "Account"
 msgstr "Compte"
 
-#: hiboo/templates/sidebar.html:32
+#: hiboo/templates/sidebar.html:10
+msgid "My profiles"
+msgstr ""
+
+#: hiboo/templates/sidebar.html:37
 msgid "Admin"
 msgstr "Admin"
 
-#: hiboo/templates/sidebar.html:35
+#: hiboo/templates/sidebar.html:40
 msgid "Services"
 msgstr "Services"
 
-#: hiboo/templates/sidebar.html:40
+#: hiboo/templates/sidebar.html:45
 msgid "Users"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:45
+#: hiboo/templates/sidebar.html:50
 msgid "About"
 msgstr "A propos"
 
-#: hiboo/templates/sidebar.html:48
+#: hiboo/templates/sidebar.html:53
 msgid "User guide"
 msgstr "Guide utilisateur"
 
-#: hiboo/templates/sidebar.html:53
+#: hiboo/templates/sidebar.html:58
 msgid "Admin guide"
 msgstr "Guide pour administrateur"
 
@@ -712,3 +715,120 @@ msgstr ""
 #~ msgid "add a SAML service"
 #~ msgstr "ajouter un service SAML"
 
+#~ msgid "Welcome to Hiboo"
+#~ msgstr "Bienvenue sur Hiboo"
+
+#~ 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."
+#~ msgstr ""
+#~ "<strong>Vous avez été redirigé vers "
+#~ "Hiboo pour vous authentifier</strong>. Hiboo"
+#~ " est votre gestionnaire de comptes "
+#~ "qui vous permet de n'avoir qu'un "
+#~ "seul mot de passe à retenir."
+
+#~ msgid ""
+#~ "Hiboo handles accounts for our services"
+#~ " and allows you to own multiple "
+#~ "profiles on each service."
+#~ msgstr ""
+#~ "Hiboo gère les comptes pour nos "
+#~ "services et vous permet d'avoir "
+#~ "plusieurs profils pour chaque service."
+
+#~ msgid ""
+#~ "You can now sign in to your "
+#~ "Hiboo account. If you do not own"
+#~ " one already (which is very probable"
+#~ " if this is your first time "
+#~ "here), please sign up first."
+#~ msgstr ""
+#~ "Vous pouvez maintenant vous connecter à"
+#~ " votre compte Hiboo. Si vous n'en "
+#~ "possédez pas déjà un (ce qui est"
+#~ " très probable si c'est la première"
+#~ " fois que vous venez ici), veuillez"
+#~ " alors vous enregistrer."
+
+#~ 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!"
+#~ msgstr ""
+
+#~ msgid "You are about to sign up for a new Hiboo account."
+#~ msgstr "Vous vous apprêtez à vous enregistrer avec un nouveau compte Hiboo."
+
+#~ 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."
+#~ msgstr ""
+#~ "En premier lieu, veuillez noter qu'un"
+#~ " seul compte Hiboo suffit. Si vous"
+#~ " en avez déjà un, veuillez "
+#~ "l'utiliser. Si vous avez besoin d'un "
+#~ "profil avec un nom d'utilisateur "
+#~ "différent, cela est possible avec un "
+#~ "seul compte Hiboo ! Veuillez nous "
+#~ "contacter en cas de problème."
+
+#~ 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)."
+#~ msgstr ""
+#~ "Le nom d'utilisateur que vous vous "
+#~ "apprêtez à choisir sera le nom de"
+#~ " votre compte Hiboo et ne pourra "
+#~ "pas être changé plus tard. Il "
+#~ "n'est pas nécessaire qu'il soit "
+#~ "identique à votre nom sur chaque "
+#~ "service, vous serez libre de créer "
+#~ "un profil avec le pseudo que vous"
+#~ " désirez (si disponible)."
+
+#~ 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."
+#~ msgstr ""
+
+#~ msgid "You are about to create your first profile."
+#~ msgstr "Vous vous apprêtez à créer votre premier profil."
+
+#~ msgid ""
+#~ "This service relies on profiles, which"
+#~ " are just as many identities that "
+#~ "you can have with your single "
+#~ "Hiboo account."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "Endpoint"
+#~ msgstr ""
+
diff --git a/hiboo/translations/nl_NL/LC_MESSAGES/messages.po b/hiboo/translations/nl_NL/LC_MESSAGES/messages.po
index 2e78139aa3cdbdfa29003642c0d551c5cf9c6a6d..526ad37eea8b04efd69f540747e4f1152b47834f 100644
--- a/hiboo/translations/nl_NL/LC_MESSAGES/messages.po
+++ b/hiboo/translations/nl_NL/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: 2019-11-13 22:27+0100\n"
+"POT-Creation-Date: 2019-11-21 23:53+0100\n"
 "PO-Revision-Date: 2019-11-13 22:18+0100\n"
 "Last-Translator: \n"
 "Language: nl\n"
@@ -18,39 +18,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: hiboo/models.py:153
+#: hiboo/models.py:152
 msgid "Profile creation is impossible"
 msgstr "Profiel maken is onmogelijk"
 
-#: hiboo/models.py:154
+#: hiboo/models.py:153
 msgid "Profile creation is reserved to managers"
 msgstr "Het maken van profielen is voorbehouden aan managers"
 
-#: hiboo/models.py:155
+#: hiboo/models.py:154
 msgid "Profile creation must be validated"
 msgstr "Het maken van profielen moet worden gevalideerd"
 
-#: hiboo/models.py:156
+#: hiboo/models.py:155
 msgid "Additional profiles must be validated"
 msgstr "Aanvullende profielen moeten worden gevalideerd"
 
-#: hiboo/models.py:157
+#: hiboo/models.py:156
 msgid "No validation is required"
 msgstr "Geen validatie vereist"
 
-#: hiboo/models.py:218
+#: hiboo/models.py:217
 msgid "signed up for this account"
 msgstr "aangemeld voor dit account"
 
-#: hiboo/models.py:219
+#: hiboo/models.py:218
 msgid "created the profile {this.profile.username} on {this.service.name}"
 msgstr "heeft het profiel {this.profile.username} gemaakt op {this.service.name}"
 
-#: hiboo/models.py:220
+#: hiboo/models.py:219
 msgid "changed your password"
 msgstr "wachtwoord veranderd"
 
-#: hiboo/models.py:221
+#: hiboo/models.py:220
 msgid "{this.value} the profile {this.profile.username} on {this.service.name}"
 msgstr ""
 
@@ -72,7 +72,7 @@ msgid "Password"
 msgstr "Wachtwoord"
 
 #: hiboo/account/forms.py:10 hiboo/account/templates/account_signin.html:3
-#: hiboo/templates/base.html:40 hiboo/templates/sidebar.html:26
+#: hiboo/templates/base.html:42 hiboo/templates/sidebar.html:31
 msgid "Sign in"
 msgstr "Aanmelden"
 
@@ -82,7 +82,7 @@ msgstr "Bevestig wachtwoord"
 
 #: hiboo/account/forms.py:22 hiboo/account/templates/account_signin.html:20
 #: hiboo/account/templates/account_signup.html:3
-#: hiboo/templates/sidebar.html:21
+#: hiboo/templates/sidebar.html:26
 msgid "Sign up"
 msgstr "Aanmelden"
 
@@ -98,11 +98,13 @@ msgstr "Nieuw wachtwoord"
 msgid "Confirm new password"
 msgstr "Bevestig nieuw wachtwoord"
 
-#: hiboo/account/forms.py:30 hiboo/templates/sidebar.html:10
+#: hiboo/account/forms.py:30 hiboo/templates/sidebar.html:15
 msgid "Change password"
 msgstr "Wachtwoord wijzigen"
 
-#: hiboo/account/templates/account_home.html:3 hiboo/templates/sidebar.html:5
+#: hiboo/account/home.py:13 hiboo/account/templates/account_home.html:3
+#: hiboo/account/templates/account_profiles.html:3
+#: hiboo/templates/sidebar.html:5
 msgid "My account"
 msgstr "Mijn rekening"
 
@@ -110,49 +112,73 @@ msgstr "Mijn rekening"
 msgid "status and history"
 msgstr "status en geschiedenis"
 
+#: hiboo/account/templates/account_profiles.html:4
+msgid "my profiles"
+msgstr ""
+
+#: hiboo/account/templates/account_profiles.html:14
+#: 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/account/templates/account_profiles.html:16
+#: hiboo/profile/templates/profile_list.html:18
+msgid "Profile username"
+msgstr ""
+
+#: hiboo/account/templates/account_profiles.html:17
+#: hiboo/profile/templates/profile_list.html:19
+msgid "Owned by"
+msgstr ""
+
+#: hiboo/account/templates/account_profiles.html:18
+#: 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/account/templates/account_profiles.html:19
+#: 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/account/templates/account_signin.html:4
 msgid "to access your account"
 msgstr "om toegang te krijgen tot uw account"
 
 #: hiboo/account/templates/account_signin.html:8
-msgid "Welcome to Hiboo"
-msgstr "Welkom bij Hiboo"
+msgid "Authentication manager"
+msgstr ""
 
 #: 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 redirected for authentication</strong>. This is our "
+"account manager, designed so you only have to authenticate once."
 msgstr ""
-"<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 "
+"It 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/account/templates/account_signin.html:11
 msgid ""
-"You can now sign in to your Hiboo account. If you do not own one already "
-"(which is very probable if this is your first time here), please sign up "
-"first."
+"You can now sign in to your account. If you do not own one already (which"
+" is 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."
 
 #: 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 used to have an account on the application 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!"
 
 #: hiboo/account/templates/account_signup.html:4
 msgid "for a new account"
@@ -163,32 +189,22 @@ msgid "I want a new account!"
 msgstr "Ik wil een nieuw account!"
 
 #: hiboo/account/templates/account_signup.html:9
-msgid "You are about to sign up for a new Hiboo account."
-msgstr "Je staat op het punt je aan te melden voor een nieuw Hiboo-account."
+msgid "You are about to sign up for a new account."
+msgstr ""
 
 #: 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 only need a single account. If you own one "
+"already, please sign in. If you need a different username, you can simply"
+" create additional profiles! 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."
 
 #: 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)."
+"Please chose your account name carefully, since you will not be able to "
+"change it later. You will then be able to create profiles under "
+"pseudonymes."
 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)."
 
 #: hiboo/account/templates/account_signup.html:12
 msgid ""
@@ -201,16 +217,6 @@ msgstr ""
 "moeilijk is om te verifiëren wie u bent en uw wachtwoord opnieuw in te "
 "stellen."
 
-#: 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."
-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."
-
 #: hiboo/profile/forms.py:9
 msgid "Comment"
 msgstr "Commentaar"
@@ -235,11 +241,37 @@ msgid "Claim an existing profile"
 msgstr ""
 
 #: 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."
+msgid "You are about to claim an existing profile on the service."
+msgstr ""
 
 #: hiboo/profile/templates/profile_claim.html:11
+msgid ""
+"Please specify the username and password of your original account on the "
+"service."
+msgstr ""
+
+#: hiboo/profile/templates/profile_claim.html:12
+msgid ""
+"If you are used to sign into that service using an email address, please "
+"specify your username or nickname instead."
+msgstr ""
+
+#: 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_create.html:13
+msgid "You are about to create an application profile."
+msgstr ""
+
 #: hiboo/profile/templates/profile_create.html:14
 msgid ""
 "Please choose a username wisely, you will not be able to change it later."
@@ -250,7 +282,6 @@ msgstr ""
 " U kunt alles kiezen dat geldig is voor de service, zolang deze "
 "beschikbaar is."
 
-#: 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 "
@@ -261,18 +292,6 @@ msgstr ""
 "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 ""
@@ -287,12 +306,6 @@ msgstr ""
 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"
@@ -306,26 +319,6 @@ msgstr ""
 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"
@@ -363,20 +356,15 @@ msgstr "Hier komen profielen!"
 #: 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."
+"you can have with your single account."
 msgstr ""
-"Deze service is gebaseerd op profielen, die evenveel identiteiten zijn "
-"die u kunt hebben met uw enkele Hiboo-account."
 
 #: 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."
+"You may think of profiles as a way to switch between a personal and a "
+"business 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."
 
 #: hiboo/profile/templates/profile_pick.html:45
 msgid ""
@@ -624,34 +612,38 @@ msgstr ""
 "redirect/post binding wordt ondersteund."
 
 #: hiboo/sso/templates/protocol_saml.html:5
-msgid "Endpoint"
-msgstr "Endpoint"
+msgid "SAML Metadata"
+msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:8
+msgid "SSO redirect binding"
+msgstr ""
+
+#: hiboo/sso/templates/protocol_saml.html:11
 msgid "ACS"
 msgstr "ACS"
 
-#: hiboo/sso/templates/protocol_saml.html:11
+#: hiboo/sso/templates/protocol_saml.html:14
 msgid "IDP certificate"
 msgstr "IDP certificaat"
 
-#: hiboo/sso/templates/protocol_saml.html:14
+#: hiboo/sso/templates/protocol_saml.html:17
 msgid "Short IDP certificate"
 msgstr "Kort IDP-certificaat"
 
-#: hiboo/sso/templates/protocol_saml.html:17
+#: hiboo/sso/templates/protocol_saml.html:20
 msgid ">SP certificate"
 msgstr ">SP certificaat"
 
-#: hiboo/sso/templates/protocol_saml.html:20
+#: hiboo/sso/templates/protocol_saml.html:23
 msgid "Short SP certificate"
 msgstr "Kort SP-certificaat"
 
-#: hiboo/sso/templates/protocol_saml.html:23
+#: hiboo/sso/templates/protocol_saml.html:26
 msgid "SP private key"
 msgstr "SP persoonlijke sleutel"
 
-#: hiboo/sso/templates/protocol_saml.html:26
+#: hiboo/sso/templates/protocol_saml.html:29
 msgid "Short SP private key"
 msgstr "Korte SP persoonlijke sleutel"
 
@@ -663,19 +655,19 @@ msgstr ""
 "Omdat uw browser JavaScript niet ondersteunt, moet u eenmaal op de knop "
 "drukken om door te gaan."
 
-#: hiboo/templates/base.html:20
+#: hiboo/templates/base.html:22
 msgid "Toggle navigation"
 msgstr "Schakel navigatie in"
 
-#: hiboo/templates/base.html:33 hiboo/templates/sidebar.html:15
+#: hiboo/templates/base.html:35 hiboo/templates/sidebar.html:20
 msgid "Sign out"
 msgstr "Afmelden"
 
-#: hiboo/templates/base.html:47
+#: hiboo/templates/base.html:49
 msgid "Help"
 msgstr "Helpen"
 
-#: hiboo/templates/base.html:84
+#: hiboo/templates/base.html:86
 msgid "Hiboo is free software distributed under the MIT license"
 msgstr "Hiboo is gratis software die wordt gedistribueerd onder de MIT-licentie"
 
@@ -696,27 +688,31 @@ msgstr "Dichtbij"
 msgid "Account"
 msgstr "Account"
 
-#: hiboo/templates/sidebar.html:32
+#: hiboo/templates/sidebar.html:10
+msgid "My profiles"
+msgstr ""
+
+#: hiboo/templates/sidebar.html:37
 msgid "Admin"
 msgstr "Beheerder"
 
-#: hiboo/templates/sidebar.html:35
+#: hiboo/templates/sidebar.html:40
 msgid "Services"
 msgstr "Diensten"
 
-#: hiboo/templates/sidebar.html:40
+#: hiboo/templates/sidebar.html:45
 msgid "Users"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:45
+#: hiboo/templates/sidebar.html:50
 msgid "About"
 msgstr "Over"
 
-#: hiboo/templates/sidebar.html:48
+#: hiboo/templates/sidebar.html:53
 msgid "User guide"
 msgstr "Gebruikershandleiding"
 
-#: hiboo/templates/sidebar.html:53
+#: hiboo/templates/sidebar.html:58
 msgid "Admin guide"
 msgstr "Admin gids"
 
@@ -735,3 +731,137 @@ msgstr ""
 #~ msgid "add a SAML service"
 #~ msgstr "voeg een SAML-service toe"
 
+#~ msgid "Welcome to Hiboo"
+#~ msgstr "Welkom bij Hiboo"
+
+#~ 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."
+#~ msgstr ""
+#~ "<strong> U werd doorgestuurd naar Hiboo"
+#~ " voor authenticatie </strong>. Hiboo is "
+#~ "onze accountmanager, dus u hoeft maar"
+#~ " één wachtwoord te onthouden."
+
+#~ 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."
+
+#~ msgid ""
+#~ "You can now sign in to your "
+#~ "Hiboo account. If you do not own"
+#~ " one already (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."
+
+#~ 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!"
+#~ 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!"
+
+#~ msgid "You are about to sign up for a new Hiboo account."
+#~ msgstr "Je staat op het punt je aan te melden voor een nieuw Hiboo-account."
+
+#~ 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."
+#~ 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."
+
+#~ 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)."
+#~ 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)."
+
+#~ 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."
+#~ 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."
+
+#~ msgid "You are about to create your first profile."
+#~ msgstr "U staat op het punt uw eerste profiel te maken."
+
+#~ msgid ""
+#~ "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."
+
+#~ 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 ""
+#~ "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."
+
+#~ msgid "Endpoint"
+#~ msgstr "Endpoint"
+
diff --git a/messages.pot b/messages.pot
index d2a916d233ec33a8ea726b006a136ea744a98a6b..df71307e9a25a1861217047c86a0cc32dc779ee9 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-11-13 22:27+0100\n"
+"POT-Creation-Date: 2019-11-21 23:53+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,39 +17,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: hiboo/models.py:153
+#: hiboo/models.py:152
 msgid "Profile creation is impossible"
 msgstr ""
 
-#: hiboo/models.py:154
+#: hiboo/models.py:153
 msgid "Profile creation is reserved to managers"
 msgstr ""
 
-#: hiboo/models.py:155
+#: hiboo/models.py:154
 msgid "Profile creation must be validated"
 msgstr ""
 
-#: hiboo/models.py:156
+#: hiboo/models.py:155
 msgid "Additional profiles must be validated"
 msgstr ""
 
-#: hiboo/models.py:157
+#: hiboo/models.py:156
 msgid "No validation is required"
 msgstr ""
 
-#: hiboo/models.py:218
+#: hiboo/models.py:217
 msgid "signed up for this account"
 msgstr ""
 
-#: hiboo/models.py:219
+#: hiboo/models.py:218
 msgid "created the profile {this.profile.username} on {this.service.name}"
 msgstr ""
 
-#: hiboo/models.py:220
+#: hiboo/models.py:219
 msgid "changed your password"
 msgstr ""
 
-#: hiboo/models.py:221
+#: hiboo/models.py:220
 msgid "{this.value} the profile {this.profile.username} on {this.service.name}"
 msgstr ""
 
@@ -71,7 +71,7 @@ msgid "Password"
 msgstr ""
 
 #: hiboo/account/forms.py:10 hiboo/account/templates/account_signin.html:3
-#: hiboo/templates/base.html:40 hiboo/templates/sidebar.html:26
+#: hiboo/templates/base.html:42 hiboo/templates/sidebar.html:31
 msgid "Sign in"
 msgstr ""
 
@@ -81,7 +81,7 @@ msgstr ""
 
 #: hiboo/account/forms.py:22 hiboo/account/templates/account_signin.html:20
 #: hiboo/account/templates/account_signup.html:3
-#: hiboo/templates/sidebar.html:21
+#: hiboo/templates/sidebar.html:26
 msgid "Sign up"
 msgstr ""
 
@@ -97,11 +97,13 @@ msgstr ""
 msgid "Confirm new password"
 msgstr ""
 
-#: hiboo/account/forms.py:30 hiboo/templates/sidebar.html:10
+#: hiboo/account/forms.py:30 hiboo/templates/sidebar.html:15
 msgid "Change password"
 msgstr ""
 
-#: hiboo/account/templates/account_home.html:3 hiboo/templates/sidebar.html:5
+#: hiboo/account/home.py:13 hiboo/account/templates/account_home.html:3
+#: hiboo/account/templates/account_profiles.html:3
+#: hiboo/templates/sidebar.html:5
 msgid "My account"
 msgstr ""
 
@@ -109,37 +111,72 @@ msgstr ""
 msgid "status and history"
 msgstr ""
 
+#: hiboo/account/templates/account_profiles.html:4
+msgid "my profiles"
+msgstr ""
+
+#: hiboo/account/templates/account_profiles.html:14
+#: 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/account/templates/account_profiles.html:16
+#: hiboo/profile/templates/profile_list.html:18
+msgid "Profile username"
+msgstr ""
+
+#: hiboo/account/templates/account_profiles.html:17
+#: hiboo/profile/templates/profile_list.html:19
+msgid "Owned by"
+msgstr ""
+
+#: hiboo/account/templates/account_profiles.html:18
+#: 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/account/templates/account_profiles.html:19
+#: 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/account/templates/account_signin.html:4
 msgid "to access your account"
 msgstr ""
 
 #: hiboo/account/templates/account_signin.html:8
-msgid "Welcome to Hiboo"
+msgid "Authentication manager"
 msgstr ""
 
 #: 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 redirected for authentication</strong>. This is our "
+"account manager, designed so you only have to authenticate once."
 msgstr ""
 
 #: hiboo/account/templates/account_signin.html:10
 msgid ""
-"Hiboo handles accounts for our services and allows you to own multiple "
+"It handles accounts for our services and allows you to own multiple "
 "profiles on each service."
 msgstr ""
 
 #: hiboo/account/templates/account_signin.html:11
 msgid ""
-"You can now sign in to your Hiboo account. If you do not own one already "
-"(which is very probable if this is your first time here), please sign up "
-"first."
+"You can now sign in to your account. If you do not own one already (which"
+" is probable if this is your first time here), please sign up first."
 msgstr ""
 
 #: 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 used to have an account on the application you are authenticating "
+"for, no panic necessary: you will be able to claim it once logged into "
+"Hiboo!"
 msgstr ""
 
 #: hiboo/account/templates/account_signup.html:4
@@ -151,23 +188,21 @@ msgid "I want a new account!"
 msgstr ""
 
 #: hiboo/account/templates/account_signup.html:9
-msgid "You are about to sign up for a new Hiboo account."
+msgid "You are about to sign up for a new account."
 msgstr ""
 
 #: 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 only need a single account. If you own one "
+"already, please sign in. If you need a different username, you can simply"
+" create additional profiles! Please contact us if you are having trouble."
 msgstr ""
 
 #: 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)."
+"Please chose your account name carefully, since you will not be able to "
+"change it later. You will then be able to create profiles under "
+"pseudonymes."
 msgstr ""
 
 #: hiboo/account/templates/account_signup.html:12
@@ -177,13 +212,6 @@ msgid ""
 "verify who you are and reset your password."
 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."
-msgstr ""
-
 #: hiboo/profile/forms.py:9
 msgid "Comment"
 msgstr ""
@@ -208,24 +236,19 @@ msgid "Claim an existing profile"
 msgstr ""
 
 #: hiboo/profile/templates/profile_claim.html:10
-#: hiboo/profile/templates/profile_create.html:13
-msgid "You are about to create your first profile."
+msgid "You are about to claim an existing profile on the service."
 msgstr ""
 
 #: 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."
+"Please specify the username and password of your original account on the "
+"service."
 msgstr ""
 
 #: 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)."
+"If you are used to sign into that service using an email address, please "
+"specify your username or nickname instead."
 msgstr ""
 
 #: hiboo/profile/templates/profile_create.html:4
@@ -240,6 +263,24 @@ msgstr ""
 msgid "Create a new profile"
 msgstr ""
 
+#: hiboo/profile/templates/profile_create.html:13
+msgid "You are about to create an application profile."
+msgstr ""
+
+#: 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/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/profile/templates/profile_details.html:4
 msgid "profile details"
 msgstr ""
@@ -254,12 +295,6 @@ msgstr ""
 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"
@@ -273,26 +308,6 @@ msgstr ""
 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"
@@ -330,14 +345,14 @@ msgstr ""
 #: 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."
+"you can have with your single account."
 msgstr ""
 
 #: 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."
+"You may think of profiles as a way to switch between a personal and a "
+"business account, or to use the service under different identities for "
+"diffrent activities."
 msgstr ""
 
 #: hiboo/profile/templates/profile_pick.html:45
@@ -570,34 +585,38 @@ msgid ""
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:5
-msgid "Endpoint"
+msgid "SAML Metadata"
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:8
-msgid "ACS"
+msgid "SSO redirect binding"
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:11
-msgid "IDP certificate"
+msgid "ACS"
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:14
-msgid "Short IDP certificate"
+msgid "IDP certificate"
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:17
-msgid ">SP certificate"
+msgid "Short IDP certificate"
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:20
-msgid "Short SP certificate"
+msgid ">SP certificate"
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:23
-msgid "SP private key"
+msgid "Short SP certificate"
 msgstr ""
 
 #: hiboo/sso/templates/protocol_saml.html:26
+msgid "SP private key"
+msgstr ""
+
+#: hiboo/sso/templates/protocol_saml.html:29
 msgid "Short SP private key"
 msgstr ""
 
@@ -607,19 +626,19 @@ msgid ""
 " once to proceed."
 msgstr ""
 
-#: hiboo/templates/base.html:20
+#: hiboo/templates/base.html:22
 msgid "Toggle navigation"
 msgstr ""
 
-#: hiboo/templates/base.html:33 hiboo/templates/sidebar.html:15
+#: hiboo/templates/base.html:35 hiboo/templates/sidebar.html:20
 msgid "Sign out"
 msgstr ""
 
-#: hiboo/templates/base.html:47
+#: hiboo/templates/base.html:49
 msgid "Help"
 msgstr ""
 
-#: hiboo/templates/base.html:84
+#: hiboo/templates/base.html:86
 msgid "Hiboo is free software distributed under the MIT license"
 msgstr ""
 
@@ -640,27 +659,31 @@ msgstr ""
 msgid "Account"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:32
+#: hiboo/templates/sidebar.html:10
+msgid "My profiles"
+msgstr ""
+
+#: hiboo/templates/sidebar.html:37
 msgid "Admin"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:35
+#: hiboo/templates/sidebar.html:40
 msgid "Services"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:40
+#: hiboo/templates/sidebar.html:45
 msgid "Users"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:45
+#: hiboo/templates/sidebar.html:50
 msgid "About"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:48
+#: hiboo/templates/sidebar.html:53
 msgid "User guide"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:53
+#: hiboo/templates/sidebar.html:58
 msgid "Admin guide"
 msgstr ""