diff --git a/app/models/user.rb b/app/models/user.rb
index 93a6c8fbf7e71be9b40abfac8d44d575f28895a1..e298ab38fe39211fbef66f4cae36c32edd3a0268 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -59,17 +59,16 @@ class User < ApplicationRecord
   # We don't include Sanitizable because too many complex attributes.
   # The sanitization is handled in User::WithAuthentication's sanitize_fields method.
   include WithAdminTheme
+  include WithAuthentication
   include WithAuthorship
   include WithAvatar
   include WithFavorites
-  # FIXME y a-t-il des couplages temporels qui justifient l'ordre ci-dessous ?
-  include WithRegistrationContext
-  include WithUniversity
-  include WithAuthentication
   include WithOmniauth
   include WithPerson
+  include WithRegistrationContext
   include WithRoles
   include WithSyncBetweenUniversities
+  include WithUniversity
 
   belongs_to :language
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c2342f7884e8009b2a40a95dc5b0ff40dc0a691f..6ca4a3f261077e9875e01ed5d32171b228fcba48 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -130,7 +130,7 @@ en:
     users_alerts:
       already_confirmed: "Your account has already been confirmed."
       not_locked_html: '<i>%{model}</i> was not locked.'
-      pending_confirmation_html: "Your account has not been <b>confirmed</b> yet. You have received an e-mail with a confirmation link. If you don't confirm, your account will stop working after <b>%{duration}</b>."
+      pending_confirmation_html: "Your account has not been <b>confirmed</b> yet. You have received an e-mail with a confirmation link. If you don't confirm, your account will stop working after <b>%{duration}</b>. If you did not received the email check your spam folder or click on the following link."
       successfully_unlocked_html: "<i>%{model}</i> was successfully unlocked."
     will_be_published_html: "<i>%{model}</i> will soon be published."
   batch_selectable:
@@ -158,6 +158,8 @@ en:
     passwords:
       new:
         send_me_reset_password_instructions: Reset my password
+    registrations:
+      signed_up: "Welcome! You have signed up successfully. You have received an e-mail with a confirmation link. If you don't confirm, your account will stop working after 1 day. If you did not received the email check your spam folder or click on the button \"I did not received the confirmation email\" on the authentication screen."
     sessions:
       signed_in: ''
     shared:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 1c6bb55a146ce7c1eeae3c8af796d5e195d6fed6..e81511ce4f68d5e8b8076c05338a4ef6296dd6e4 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -130,7 +130,7 @@ fr:
     users_alerts:
       already_confirmed: "Votre compte est déjà confirmé."
       not_locked_html: "<i>%{model}</i> n'était pas verrouillé(e)."
-      pending_confirmation_html: "Votre compte n'a pas encore été <b>confirmé</b>. Vous avez reçu un e-mail contenant un lien de confirmation. En l'absence de confirmation, votre compte cessera de fonctionner après <b>%{duration}</b>."
+      pending_confirmation_html: "Votre compte n'a pas encore été <b>confirmé</b>. Vous avez reçu un e-mail contenant un lien de confirmation. En l'absence de confirmation, votre compte cessera de fonctionner après <b>%{duration}</b>. Si vous n'avez pas reçu cet email pensez à vérifier votre dossier spam ou cliquez sur le bouton ci-dessous."
       successfully_unlocked_html: "<i>%{model}</i> a bien été déverrouillé(e)."
     will_be_published_html: "<i>%{model}</i> va bientôt être publié(e)."
   batch_selectable:
@@ -158,6 +158,8 @@ fr:
     passwords:
       new:
         send_me_reset_password_instructions: Réinitialiser mon mot de passe
+    registrations:
+      signed_up: "Bienvenue ! Vous vous êtes bien enregistré(e). Vous avez reçu un e-mail contenant un lien de confirmation. En l'absence de confirmation, votre compte cessera de fonctionner après 1 jour. Si vous n'avez pas reçu cet email pensez à vérifier votre dossier spam ou cliquez sur le bouton \"je n'ai pas reçu l'email de confirmation\" de l'écran d'identification."
     sessions:
       signed_in: ''
     shared:
diff --git a/db/schema.rb b/db/schema.rb
index 7a3b26203ff13db87881df7e8ef8046f09c5f78a..2e6b80e8a1c8c32a9dfa3a120f61c14e2cd0a6d7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_06_14_062545) do
+ActiveRecord::Schema[7.0].define(version: 2023_07_03_103209) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"