diff --git a/app/models/communication/extranet/localization.rb b/app/models/communication/extranet/localization.rb
index aad97c150..1d7ae251e 100644
--- a/app/models/communication/extranet/localization.rb
+++ b/app/models/communication/extranet/localization.rb
@@ -94,11 +94,11 @@ def prevent_unpublishing_default_language
   end
 
   def set_default_invitation_messages
-    self.invitation_message_automatic_subject = I18n.t('mailers.extranet.invitation_messages.automatic.subject', locale: language.iso_code) if self.invitation_message_automatic_subject.blank?
-    self.invitation_message_automatic_text = I18n.t('mailers.extranet.invitation_messages.automatic.text', locale: language.iso_code) if self.invitation_message_automatic_text.blank?
-    self.invitation_message_manual_subject = I18n.t('mailers.extranet.invitation_messages.manual.subject', locale: language.iso_code) if self.invitation_message_manual_subject.blank?
-    self.invitation_message_manual_text = I18n.t('mailers.extranet.invitation_messages.manual.text', locale: language.iso_code) if self.invitation_message_manual_text.blank?
-    self.invitation_message_manual_signature = I18n.t('mailers.extranet.invitation_messages.manual.signature', locale: language.iso_code) if self.invitation_message_manual_signature.blank?
+    self.invitation_message_automatic_subject = I18n.t('mailers.extranet.invitation_messages.automatic.default_subject', locale: language.iso_code) if self.invitation_message_automatic_subject.blank?
+    self.invitation_message_automatic_text = I18n.t('mailers.extranet.invitation_messages.automatic.default_text', locale: language.iso_code) if self.invitation_message_automatic_text.blank?
+    self.invitation_message_manual_subject = I18n.t('mailers.extranet.invitation_messages.manual.default_subject', locale: language.iso_code) if self.invitation_message_manual_subject.blank?
+    self.invitation_message_manual_text = I18n.t('mailers.extranet.invitation_messages.manual.default_text', locale: language.iso_code) if self.invitation_message_manual_text.blank?
+    self.invitation_message_manual_signature = I18n.t('mailers.extranet.invitation_messages.manual.default_signature', locale: language.iso_code) if self.invitation_message_manual_signature.blank?
   end
 
 end
diff --git a/app/views/admin/communication/extranets/_form.html.erb b/app/views/admin/communication/extranets/_form.html.erb
index 84805dc43..2e44823b4 100644
--- a/app/views/admin/communication/extranets/_form.html.erb
+++ b/app/views/admin/communication/extranets/_form.html.erb
@@ -77,31 +77,31 @@
           <p class="form-text"><%= t('admin.communication.extranet.invitation_messages.automatic_hint') %></p>
           <%= lf.input :invitation_message_automatic_subject, 
                         input_html: { 
-                          value: l10n.invitation_message_automatic_subject.presence || t('mailers.extranet.invitation_messages.automatic.subject') 
+                          value: l10n.invitation_message_automatic_subject.presence || t('mailers.extranet.invitation_messages.automatic.default_subject') 
                         } %>
           <%= lf.input :invitation_message_automatic_text, 
                         as: :text, 
                         input_html: { 
                           rows: 5,
-                          value: l10n.invitation_message_automatic_text.presence || t('mailers.extranet.invitation_messages.automatic.text') 
+                          value: l10n.invitation_message_automatic_text.presence || t('mailers.extranet.invitation_messages.automatic.default_text') 
                         } %>
           <p class="fw-bold"><%= t('admin.communication.extranet.invitation_messages.manual') %></p>
           <p class="form-text"><%= t('admin.communication.extranet.invitation_messages.manual_hint_html') %></p>
           <%= lf.input :invitation_message_manual_subject,
                         input_html: {
-                          value: l10n.invitation_message_manual_subject.presence || t('mailers.extranet.invitation_messages.manual.subject')
+                          value: l10n.invitation_message_manual_subject.presence || t('mailers.extranet.invitation_messages.manual.default_subject')
                         } %>
           <%= lf.input :invitation_message_manual_text, 
                         as: :text, 
                         input_html: { 
                             rows: 5,
-                            value: l10n.invitation_message_manual_text.presence || t('mailers.extranet.invitation_messages.manual.text')
+                            value: l10n.invitation_message_manual_text.presence || t('mailers.extranet.invitation_messages.manual.default_text')
                           } %>
           <%= lf.input :invitation_message_manual_signature, 
                         as: :text, 
                         input_html: { 
                             rows: 2,
-                            value: l10n.invitation_message_manual_signature.presence || t('mailers.extranet.invitation_messages.manual.signature')
+                            value: l10n.invitation_message_manual_signature.presence || t('mailers.extranet.invitation_messages.manual.default_signature')
                           } %>
         <% end %>
         <%= osuny_panel t('legal') do %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 45e913ba9..2fb8008ed 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -501,15 +501,15 @@ en:
     extranet:
       invitation_messages:
         automatic:
-          subject: Welcome to your extranet
-          text: You now have access to the extranet.
+          default_subject: Welcome to your extranet
+          default_text: You now have access to the extranet.
           with_user_html: You can sign in with your email address <b>%{email}</b> by <a href="%{sign_in_url}">clicking here</a>.
           without_user_html: You can sign up with your email address <b>%{email}</b> by <a href="%{sign_up_url}">clicking here</a>.
         manual:
           cta: Join the extranet
-          signature: Yours
-          subject: Invitation from {{sender_name}} (promotion {{sender_years}}) to join the extranet
-          text: |
+          default_signature: Yours
+          default_subject: Invitation from {{sender_name}} (promotion {{sender_years}}) to join the extranet
+          default_text: |
             Hello {{name}},
             
             {{sender_name}} invites you to join the Alumni extranet.
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 403815fe2..c5213a9c5 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -501,15 +501,15 @@ fr:
     extranet:
       invitation_messages:
         automatic:
-          subject: Bienvenue sur votre extranet
-          text: Vous avez désormais accès à l'extranet.
+          default_subject: Bienvenue sur votre extranet
+          default_text: Vous avez désormais accès à l'extranet.
           with_user_html: Vous pouvez vous y connecter avec votre adresse email <b>%{email}</b> en <a href="%{sign_in_url}">cliquant ici</a>.
           without_user_html: Vous pouvez vous y inscrire avec votre adresse email <b>%{email}</b> en <a href="%{sign_up_url}">cliquant ici</a>.
         manual:
           cta: Rejoindre l'extranet
-          signature: Cordialement
-          subject: Invitation de {{sender_name}} (promotion {{sender_years}}) à rejoindre l'extranet
-          text: |
+          default_signature: Cordialement
+          default_subject: Invitation de {{sender_name}} (promotion {{sender_years}}) à rejoindre l'extranet
+          default_text: |
             Bonjour {{name}},
 
             {{sender_name}} vous invite à rejoindre l'extranet des Alumni.