diff --git a/app/public/admin/actions/settings.php b/app/public/admin/actions/settings.php
index df6094a..2d00c85 100644
--- a/app/public/admin/actions/settings.php
+++ b/app/public/admin/actions/settings.php
@@ -111,7 +111,7 @@ if ($section === 'formulaire_restrictions') {
         'port'         => $_POST['smtp_port']         ?? 587,
         'encryption'   => $_POST['smtp_encryption']   ?? 'tls',
         'username'     => $_POST['smtp_username']     ?? '',
-        'from_email'   => $_POST['smtp_from_email']   ?? '',
+        'from_email'   => $_POST['smtp_username']     ?? '',  // same as username
         'from_name'    => $_POST['smtp_from_name']    ?? 'XAMXAM',
         'notify_email' => $_POST['smtp_notify_email'] ?? '',
     ];
diff --git a/app/templates/admin/acces.php b/app/templates/admin/acces.php
index 10c3f36..dfe07ce 100644
--- a/app/templates/admin/acces.php
+++ b/app/templates/admin/acces.php
@@ -831,6 +831,19 @@
 +%%%%%%% diff from: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
 +\\\\\\\        to: rxwmppwn 5ae93b41 "fix: remove alt labels, fix curl_close deprecation, fix PeerTube description param" (rebased revision)
 ++                        $linkName = $link['name'] ?? '';
+++                        $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff from: rxwmppwn 5ae93b41 "fix: remove alt labels, fix curl_close deprecation, fix PeerTube description param" (rebased revision)
+\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\        to: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
+-                        $linkName = $link['name'] ?? '';
+-                        $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff from: somsyvxz 14a3cd10 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebase destination)
+\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\        to: usmyqlwr c92d280e "cleanup: merge SMTP fields into single fieldset, rename to Emails" (rebased revision)
+                         $linkName = $link['name'] ?? '';
+                         $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
+                         $linkLockedYear = $link['locked_year'] ?? null;
++%%%%%%% diff from: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
++\\\\\\\        to: usmyqlwr 6acee66b "cleanup: merge SMTP fields into single fieldset, rename to Emails" (rebased revision)
+++                        $linkName = $link['name'] ?? '';
 ++                        $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
                     ?>
                     <tr class="admin-table-row" onclick="event.stopPropagation(); window.open('/partage/<?= urlencode($link['slug']) ?>', '_blank')" style="cursor:pointer">
diff --git a/app/templates/admin/parametres.php b/app/templates/admin/parametres.php
index dc29ad9..9fef6b5 100644
--- a/app/templates/admin/parametres.php
+++ b/app/templates/admin/parametres.php
@@ -40,9 +40,9 @@
          RELAY SMTP
     ══════════════════════════════════════════════════════════════ -->
     <section aria-labelledby="settings-smtp-title">
-        <h2 id="settings-smtp-title">Relay SMTP</h2>
+        <h2 id="settings-smtp-title">Emails</h2>
         <p>
-            Identifiants du serveur SMTP utilisé pour l'envoi d'e-mails
+            Configuration du serveur SMTP pour l'envoi d'e-mails
             (notifications, partage de TFE, etc.).
         </p>
         <div class="param-smtp-status">
@@ -112,11 +112,13 @@
                 </div>
 
                 <div>
-                    <label for="smtp_username">Nom d'utilisateur</label>
-                    <input type="text" id="smtp_username" name="smtp_username"
+                    <label for="smtp_username">Adresse e-mail</label>
+                    <input type="email" id="smtp_username" name="smtp_username"
                            value="<?= htmlspecialchars($smtpSettings['username']) ?>"
+                           placeholder="xamxam@erg.be"
                            <?= $smtpFieldErr('smtp_username') ?>
                            <?= $smtpErrorField === 'smtp_username' ? 'aria-describedby="smtp_username-error"' : '' ?>>
+                    <small>Adresse utilisée pour l'authentification SMTP et comme expéditeur.</small>
                     <?= $smtpFieldMsg('smtp_username', $smtpHints['smtp_username']) ?>
                 </div>
 
@@ -130,32 +132,21 @@
                            <?= $smtpErrorField === 'smtp_password' ? 'aria-describedby="smtp_password-error"' : '' ?>>
                     <?= $smtpFieldMsg('smtp_password', $smtpHints['smtp_password']) ?>
                 </div>
-            </div>
 
-            <fieldset>
-                <legend>Expéditeur par défaut</legend>
-                <div class="param-grid">
-                    <div>
-                        <label for="smtp_from_email">Adresse e-mail d'expédition</label>
-                        <input type="email" id="smtp_from_email" name="smtp_from_email"
-                               value="<?= htmlspecialchars($smtpSettings['from_email']) ?>"
-                               placeholder="noreply@example.com">
-                        <small>Adresse utilisée comme expéditeur (champ From:).</small>
-                    </div>
-                    <div>
-                        <label for="smtp_from_name">Nom d'expéditeur</label>
-                        <input type="text" id="smtp_from_name" name="smtp_from_name"
-                               value="<?= htmlspecialchars($smtpSettings['from_name']) ?>">
-                    </div>
-                    <div>
-                        <label for="smtp_notify_email">Adresse de notification admin</label>
-                        <input type="email" id="smtp_notify_email" name="smtp_notify_email"
-                               value="<?= htmlspecialchars($smtpSettings['notify_email'] ?? '') ?>"
-                               placeholder="admin@example.com">
-                        <small>Reçoit les notifications (demandes d’accès, etc.). Si vide, utilise l’adresse d’expédition.</small>
-                    </div>
+                <div>
+                    <label for="smtp_from_name">Nom d'expéditeur</label>
+                    <input type="text" id="smtp_from_name" name="smtp_from_name"
+                           value="<?= htmlspecialchars($smtpSettings['from_name']) ?>">
                 </div>
-            </fieldset>
+
+                <div>
+                    <label for="smtp_notify_email">Adresse de notification admin</label>
+                    <input type="email" id="smtp_notify_email" name="smtp_notify_email"
+                           value="<?= htmlspecialchars($smtpSettings['notify_email'] ?? '') ?>"
+                           placeholder="admin@example.com">
+                    <small>Reçoit les notifications (demandes d'accès, etc.). Si vide, utilise l'adresse d'expédition.</small>
+                </div>
+            </div>
 
             <button type="submit" class="btn btn--primary">Enregistrer</button>
         </form>