diff --git a/src/pages/ch/konto/angemeldet.astro b/src/pages/ch/konto/angemeldet.astro
index 264aeb8..ba5eb34 100644
--- a/src/pages/ch/konto/angemeldet.astro
+++ b/src/pages/ch/konto/angemeldet.astro
@@ -180,17 +180,8 @@ const offeneSendungen = beispielBestellungen.filter((b) => b.status === "versend
           </div>
         </div>
 
-        {/* Fester Pflicht-Name (z.B. für Bestellungen/Lieferadresse) — getrennt vom optionalen
-            Benutzernamen weiter unten, der nur ein Spitzname-Bonus ist. */}
-        <div class="profile-field">
-          <label for="profile-name">{t.accountDash.profileName}</label>
-          <div class="profile-field-row">
-            <input type="text" id="profile-name" maxlength="60" />
-            <button type="button" class="btn btn-primary btn-sm" id="profile-name-save">{t.accountDash.nameSave}</button>
-          </div>
-          <span class="small" id="profile-name-status" style="display:none; color: var(--c-accent);">{t.accountDash.nameSaved}</span>
-        </div>
-
+        {/* Optionaler Spitzname zuerst (Bonus, wird bevorzugt angezeigt), darunter der feste
+            Pflicht-Name (z.B. für Bestellungen/Lieferadresse). */}
         <div class="profile-field">
           <label for="profile-username">{t.accountDash.usernameLabel}</label>
           <div class="profile-field-row">
@@ -201,6 +192,15 @@ const offeneSendungen = beispielBestellungen.filter((b) => b.status === "versend
           <span class="small" style="display:block; color: var(--c-text-muted); margin-top:0.3em;">{t.accountDash.usernameHint}</span>
         </div>
 
+        <div class="profile-field">
+          <label for="profile-name">{t.accountDash.profileName}</label>
+          <div class="profile-field-row">
+            <input type="text" id="profile-name" maxlength="60" />
+            <button type="button" class="btn btn-primary btn-sm" id="profile-name-save">{t.accountDash.nameSave}</button>
+          </div>
+          <span class="small" id="profile-name-status" style="display:none; color: var(--c-accent);">{t.accountDash.nameSaved}</span>
+        </div>
+
         <table class="specs">
           <tbody>
             <tr><th>{t.accountDash.profileEmail}</th><td id="profile-email">–</td></tr>
diff --git a/src/pages/en/konto/angemeldet.astro b/src/pages/en/konto/angemeldet.astro
index 6120f07..c373140 100644
--- a/src/pages/en/konto/angemeldet.astro
+++ b/src/pages/en/konto/angemeldet.astro
@@ -180,17 +180,8 @@ const offeneSendungen = beispielBestellungen.filter((b) => b.status === "versend
           </div>
         </div>
 
-        {/* Fester Pflicht-Name (z.B. für Bestellungen/Lieferadresse) — getrennt vom optionalen
-            Benutzernamen weiter unten, der nur ein Spitzname-Bonus ist. */}
-        <div class="profile-field">
-          <label for="profile-name">{t.accountDash.profileName}</label>
-          <div class="profile-field-row">
-            <input type="text" id="profile-name" maxlength="60" />
-            <button type="button" class="btn btn-primary btn-sm" id="profile-name-save">{t.accountDash.nameSave}</button>
-          </div>
-          <span class="small" id="profile-name-status" style="display:none; color: var(--c-accent);">{t.accountDash.nameSaved}</span>
-        </div>
-
+        {/* Optionaler Spitzname zuerst (Bonus, wird bevorzugt angezeigt), darunter der feste
+            Pflicht-Name (z.B. für Bestellungen/Lieferadresse). */}
         <div class="profile-field">
           <label for="profile-username">{t.accountDash.usernameLabel}</label>
           <div class="profile-field-row">
@@ -201,6 +192,15 @@ const offeneSendungen = beispielBestellungen.filter((b) => b.status === "versend
           <span class="small" style="display:block; color: var(--c-text-muted); margin-top:0.3em;">{t.accountDash.usernameHint}</span>
         </div>
 
+        <div class="profile-field">
+          <label for="profile-name">{t.accountDash.profileName}</label>
+          <div class="profile-field-row">
+            <input type="text" id="profile-name" maxlength="60" />
+            <button type="button" class="btn btn-primary btn-sm" id="profile-name-save">{t.accountDash.nameSave}</button>
+          </div>
+          <span class="small" id="profile-name-status" style="display:none; color: var(--c-accent);">{t.accountDash.nameSaved}</span>
+        </div>
+
         <table class="specs">
           <tbody>
             <tr><th>{t.accountDash.profileEmail}</th><td id="profile-email">–</td></tr>
diff --git a/src/pages/fr/konto/angemeldet.astro b/src/pages/fr/konto/angemeldet.astro
index e0bd48e..3fd5a49 100644
--- a/src/pages/fr/konto/angemeldet.astro
+++ b/src/pages/fr/konto/angemeldet.astro
@@ -180,17 +180,8 @@ const offeneSendungen = beispielBestellungen.filter((b) => b.status === "versend
           </div>
         </div>
 
-        {/* Fester Pflicht-Name (z.B. für Bestellungen/Lieferadresse) — getrennt vom optionalen
-            Benutzernamen weiter unten, der nur ein Spitzname-Bonus ist. */}
-        <div class="profile-field">
-          <label for="profile-name">{t.accountDash.profileName}</label>
-          <div class="profile-field-row">
-            <input type="text" id="profile-name" maxlength="60" />
-            <button type="button" class="btn btn-primary btn-sm" id="profile-name-save">{t.accountDash.nameSave}</button>
-          </div>
-          <span class="small" id="profile-name-status" style="display:none; color: var(--c-accent);">{t.accountDash.nameSaved}</span>
-        </div>
-
+        {/* Optionaler Spitzname zuerst (Bonus, wird bevorzugt angezeigt), darunter der feste
+            Pflicht-Name (z.B. für Bestellungen/Lieferadresse). */}
         <div class="profile-field">
           <label for="profile-username">{t.accountDash.usernameLabel}</label>
           <div class="profile-field-row">
@@ -201,6 +192,15 @@ const offeneSendungen = beispielBestellungen.filter((b) => b.status === "versend
           <span class="small" style="display:block; color: var(--c-text-muted); margin-top:0.3em;">{t.accountDash.usernameHint}</span>
         </div>
 
+        <div class="profile-field">
+          <label for="profile-name">{t.accountDash.profileName}</label>
+          <div class="profile-field-row">
+            <input type="text" id="profile-name" maxlength="60" />
+            <button type="button" class="btn btn-primary btn-sm" id="profile-name-save">{t.accountDash.nameSave}</button>
+          </div>
+          <span class="small" id="profile-name-status" style="display:none; color: var(--c-accent);">{t.accountDash.nameSaved}</span>
+        </div>
+
         <table class="specs">
           <tbody>
             <tr><th>{t.accountDash.profileEmail}</th><td id="profile-email">–</td></tr>
diff --git a/src/pages/konto/angemeldet.astro b/src/pages/konto/angemeldet.astro
index 33f69d4..64a9ebb 100644
--- a/src/pages/konto/angemeldet.astro
+++ b/src/pages/konto/angemeldet.astro
@@ -180,17 +180,8 @@ const offeneSendungen = beispielBestellungen.filter((b) => b.status === "versend
           </div>
         </div>
 
-        {/* Fester Pflicht-Name (z.B. für Bestellungen/Lieferadresse) — getrennt vom optionalen
-            Benutzernamen weiter unten, der nur ein Spitzname-Bonus ist. */}
-        <div class="profile-field">
-          <label for="profile-name">{t.accountDash.profileName}</label>
-          <div class="profile-field-row">
-            <input type="text" id="profile-name" maxlength="60" />
-            <button type="button" class="btn btn-primary btn-sm" id="profile-name-save">{t.accountDash.nameSave}</button>
-          </div>
-          <span class="small" id="profile-name-status" style="display:none; color: var(--c-accent);">{t.accountDash.nameSaved}</span>
-        </div>
-
+        {/* Optionaler Spitzname zuerst (Bonus, wird bevorzugt angezeigt), darunter der feste
+            Pflicht-Name (z.B. für Bestellungen/Lieferadresse). */}
         <div class="profile-field">
           <label for="profile-username">{t.accountDash.usernameLabel}</label>
           <div class="profile-field-row">
@@ -201,6 +192,15 @@ const offeneSendungen = beispielBestellungen.filter((b) => b.status === "versend
           <span class="small" style="display:block; color: var(--c-text-muted); margin-top:0.3em;">{t.accountDash.usernameHint}</span>
         </div>
 
+        <div class="profile-field">
+          <label for="profile-name">{t.accountDash.profileName}</label>
+          <div class="profile-field-row">
+            <input type="text" id="profile-name" maxlength="60" />
+            <button type="button" class="btn btn-primary btn-sm" id="profile-name-save">{t.accountDash.nameSave}</button>
+          </div>
+          <span class="small" id="profile-name-status" style="display:none; color: var(--c-accent);">{t.accountDash.nameSaved}</span>
+        </div>
+
         <table class="specs">
           <tbody>
             <tr><th>{t.accountDash.profileEmail}</th><td id="profile-email">–</td></tr>