From f87e5b35dbc86b547aa5fed7d4a7983351d2b83e Mon Sep 17 00:00:00 2001
From: chmst <dev@chmst.de>
Date: Mon, 17 Nov 2025 16:12:21 +0100
Subject: [PATCH 1/5] Display Reset Legend if there is a label or not.

---
 components/com_users/forms/reset_request.xml | 2 +-
 components/com_users/tmpl/reset/default.php  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/components/com_users/forms/reset_request.xml b/components/com_users/forms/reset_request.xml
index eb83464830fd2..1c076d1fc7693 100644
--- a/components/com_users/forms/reset_request.xml
+++ b/components/com_users/forms/reset_request.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form>
-	<fieldset name="default" label="COM_USERS_RESET_REQUEST_LABEL">
+	<fieldset name="default">
 		<field
 			name="email"
 			type="email"
diff --git a/components/com_users/tmpl/reset/default.php b/components/com_users/tmpl/reset/default.php
index 7fa7267a5c047..70ad52b80dee8 100644
--- a/components/com_users/tmpl/reset/default.php
+++ b/components/com_users/tmpl/reset/default.php
@@ -32,9 +32,8 @@
     <form action="<?php echo Route::_('index.php?task=reset.request'); ?>" method="post" id="user-registration" class="com-users-reset__form form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <fieldset>
-                <?php if (isset($fieldset->label)) : ?>
-                    <legend><?php echo Text::_($fieldset->label); ?></legend>
-                <?php endif; ?>
+                <legend><?php echo Text::_('COM_USERS_RESET'); ?></legend>
+                <p><?php echo Text::_('COM_USERS_RESET_REQUEST_LABEL'); ?><p>
                 <?php echo $this->form->renderFieldset($fieldset->name); ?>
             </fieldset>
         <?php endforeach; ?>

From 1f7075107598f76e7a0a856bba27f8c8ea0bb2c7 Mon Sep 17 00:00:00 2001
From: chmst <dev@chmst.de>
Date: Mon, 17 Nov 2025 20:10:27 +0100
Subject: [PATCH 2/5] Fix also reset confirm and complete

---
 components/com_users/forms/reset_complete.xml | 2 +-
 components/com_users/forms/reset_confirm.xml  | 2 +-
 components/com_users/tmpl/reset/complete.php  | 6 +++---
 components/com_users/tmpl/reset/confirm.php   | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/components/com_users/forms/reset_complete.xml b/components/com_users/forms/reset_complete.xml
index a5f292baf1ff6..3eafa216e1c87 100644
--- a/components/com_users/forms/reset_complete.xml
+++ b/components/com_users/forms/reset_complete.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form>
-	<fieldset name="default" label="COM_USERS_RESET_COMPLETE_LABEL">
+	<fieldset name="default">
 		<field
 			name="password1"
 			type="password"
diff --git a/components/com_users/forms/reset_confirm.xml b/components/com_users/forms/reset_confirm.xml
index a80774dd0ad50..9114d9aae556a 100644
--- a/components/com_users/forms/reset_confirm.xml
+++ b/components/com_users/forms/reset_confirm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form>
-	<fieldset name="default" label="COM_USERS_RESET_CONFIRM_LABEL">
+	<fieldset name="default">
 		<field
 			name="username"
 			type="text"
diff --git a/components/com_users/tmpl/reset/complete.php b/components/com_users/tmpl/reset/complete.php
index 13fe66290e8dc..b27729c6f2514 100644
--- a/components/com_users/tmpl/reset/complete.php
+++ b/components/com_users/tmpl/reset/complete.php
@@ -32,9 +32,9 @@
     <form action="<?php echo Route::_('index.php?task=reset.complete'); ?>" method="post" class="com-users-reset-complete__form form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <fieldset>
-                <?php if (isset($fieldset->label)) : ?>
-                    <legend><?php echo Text::_($fieldset->label); ?></legend>
-                <?php endif; ?>
+            <fieldset>
+                <legend><?php echo Text::_('COM_USERS_COMPLETE'); ?></legend>
+                <p><?php echo Text::_('COM_USERS_RESET_COMPLETE_LABEL'); ?><p>
                 <?php echo $this->form->renderFieldset($fieldset->name); ?>
             </fieldset>
         <?php endforeach; ?>
diff --git a/components/com_users/tmpl/reset/confirm.php b/components/com_users/tmpl/reset/confirm.php
index 755240c7896c7..106d9a5d63648 100644
--- a/components/com_users/tmpl/reset/confirm.php
+++ b/components/com_users/tmpl/reset/confirm.php
@@ -32,9 +32,9 @@
     <form action="<?php echo Route::_('index.php?task=reset.confirm'); ?>" method="post" class="com-users-reset-confirm__form form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <fieldset>
-                <?php if (isset($fieldset->label)) : ?>
-                    <legend><?php echo Text::_($fieldset->label); ?></legend>
-                <?php endif; ?>
+            <fieldset>
+                <legend><?php echo Text::_('COM_USERS_FIELD_RESET_CONFIRM_TOKEN_LABEL'); ?></legend>
+                <p><?php echo Text::_('COM_USERS_RESET_CONFIRM_LABEL'); ?><p>
                 <?php echo $this->form->renderFieldset($fieldset->name); ?>
             </fieldset>
         <?php endforeach; ?>

From 002738a764d4c077c16a151a1a9701996a9d0d32 Mon Sep 17 00:00:00 2001
From: chmst <dev@chmst.de>
Date: Mon, 17 Nov 2025 20:12:49 +0100
Subject: [PATCH 3/5] copy-paste

---
 components/com_users/tmpl/reset/complete.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/com_users/tmpl/reset/complete.php b/components/com_users/tmpl/reset/complete.php
index b27729c6f2514..5abe216a2ad87 100644
--- a/components/com_users/tmpl/reset/complete.php
+++ b/components/com_users/tmpl/reset/complete.php
@@ -31,7 +31,6 @@
     <?php endif; ?>
     <form action="<?php echo Route::_('index.php?task=reset.complete'); ?>" method="post" class="com-users-reset-complete__form form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
-            <fieldset>
             <fieldset>
                 <legend><?php echo Text::_('COM_USERS_COMPLETE'); ?></legend>
                 <p><?php echo Text::_('COM_USERS_RESET_COMPLETE_LABEL'); ?><p>

From 0510135dfd1832ae8afbae163b57e5f2b2f98666 Mon Sep 17 00:00:00 2001
From: chmst <dev@chmst.de>
Date: Mon, 17 Nov 2025 20:14:29 +0100
Subject: [PATCH 4/5] copa-paste

---
 components/com_users/tmpl/reset/confirm.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/com_users/tmpl/reset/confirm.php b/components/com_users/tmpl/reset/confirm.php
index 106d9a5d63648..d970da2bc4785 100644
--- a/components/com_users/tmpl/reset/confirm.php
+++ b/components/com_users/tmpl/reset/confirm.php
@@ -31,7 +31,6 @@
     <?php endif; ?>
     <form action="<?php echo Route::_('index.php?task=reset.confirm'); ?>" method="post" class="com-users-reset-confirm__form form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
-            <fieldset>
             <fieldset>
                 <legend><?php echo Text::_('COM_USERS_FIELD_RESET_CONFIRM_TOKEN_LABEL'); ?></legend>
                 <p><?php echo Text::_('COM_USERS_RESET_CONFIRM_LABEL'); ?><p>

From abb898a13567ff0c9d806dda7b2e073a858de2e7 Mon Sep 17 00:00:00 2001
From: Harald Leithner <leithner@itronic.at>
Date: Wed, 26 Nov 2025 19:28:16 +0100
Subject: [PATCH 5/5] Use new legend attribute and keep text in the xml

---
 components/com_users/forms/reset_complete.xml | 2 +-
 components/com_users/forms/reset_confirm.xml  | 2 +-
 components/com_users/forms/reset_request.xml  | 2 +-
 components/com_users/tmpl/reset/complete.php  | 8 ++++++--
 components/com_users/tmpl/reset/confirm.php   | 8 ++++++--
 components/com_users/tmpl/reset/default.php   | 8 ++++++--
 6 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/components/com_users/forms/reset_complete.xml b/components/com_users/forms/reset_complete.xml
index 3eafa216e1c87..a008ad6091fb4 100644
--- a/components/com_users/forms/reset_complete.xml
+++ b/components/com_users/forms/reset_complete.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form>
-	<fieldset name="default">
+	<fieldset name="default" legend="COM_USERS_COMPLETE" description="COM_USERS_RESET_COMPLETE_LABEL">
 		<field
 			name="password1"
 			type="password"
diff --git a/components/com_users/forms/reset_confirm.xml b/components/com_users/forms/reset_confirm.xml
index 9114d9aae556a..30cd18a2987ae 100644
--- a/components/com_users/forms/reset_confirm.xml
+++ b/components/com_users/forms/reset_confirm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form>
-	<fieldset name="default">
+	<fieldset name="default" legend="COM_USERS_FIELD_RESET_CONFIRM_TOKEN_LABEL" description="COM_USERS_RESET_CONFIRM_LABEL">
 		<field
 			name="username"
 			type="text"
diff --git a/components/com_users/forms/reset_request.xml b/components/com_users/forms/reset_request.xml
index 1c076d1fc7693..73dbb83a6e92b 100644
--- a/components/com_users/forms/reset_request.xml
+++ b/components/com_users/forms/reset_request.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form>
-	<fieldset name="default">
+	<fieldset name="default" legend="COM_USERS_RESET" description="COM_USERS_RESET_REQUEST_LABEL">
 		<field
 			name="email"
 			type="email"
diff --git a/components/com_users/tmpl/reset/complete.php b/components/com_users/tmpl/reset/complete.php
index 5abe216a2ad87..7165addd18cfc 100644
--- a/components/com_users/tmpl/reset/complete.php
+++ b/components/com_users/tmpl/reset/complete.php
@@ -32,8 +32,12 @@
     <form action="<?php echo Route::_('index.php?task=reset.complete'); ?>" method="post" class="com-users-reset-complete__form form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <fieldset>
-                <legend><?php echo Text::_('COM_USERS_COMPLETE'); ?></legend>
-                <p><?php echo Text::_('COM_USERS_RESET_COMPLETE_LABEL'); ?><p>
+                <?php if (isset($fieldset->legend)) : ?>
+                    <legend><?php echo Text::_($fieldset->legend); ?></legend>
+                <?php endif; ?>
+                <?php if (isset($fieldset->description)) : ?>
+                    <p><?php echo Text::_($fieldset->description); ?></p>
+                <?php endif; ?>
                 <?php echo $this->form->renderFieldset($fieldset->name); ?>
             </fieldset>
         <?php endforeach; ?>
diff --git a/components/com_users/tmpl/reset/confirm.php b/components/com_users/tmpl/reset/confirm.php
index d970da2bc4785..aaef91b2a30db 100644
--- a/components/com_users/tmpl/reset/confirm.php
+++ b/components/com_users/tmpl/reset/confirm.php
@@ -32,8 +32,12 @@
     <form action="<?php echo Route::_('index.php?task=reset.confirm'); ?>" method="post" class="com-users-reset-confirm__form form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <fieldset>
-                <legend><?php echo Text::_('COM_USERS_FIELD_RESET_CONFIRM_TOKEN_LABEL'); ?></legend>
-                <p><?php echo Text::_('COM_USERS_RESET_CONFIRM_LABEL'); ?><p>
+                <?php if (isset($fieldset->legend)) : ?>
+                    <legend><?php echo Text::_($fieldset->legend); ?></legend>
+                <?php endif; ?>
+                <?php if (isset($fieldset->description)) : ?>
+                    <p><?php echo Text::_($fieldset->description); ?></p>
+                <?php endif; ?>
                 <?php echo $this->form->renderFieldset($fieldset->name); ?>
             </fieldset>
         <?php endforeach; ?>
diff --git a/components/com_users/tmpl/reset/default.php b/components/com_users/tmpl/reset/default.php
index 70ad52b80dee8..491601681305e 100644
--- a/components/com_users/tmpl/reset/default.php
+++ b/components/com_users/tmpl/reset/default.php
@@ -32,8 +32,12 @@
     <form action="<?php echo Route::_('index.php?task=reset.request'); ?>" method="post" id="user-registration" class="com-users-reset__form form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <fieldset>
-                <legend><?php echo Text::_('COM_USERS_RESET'); ?></legend>
-                <p><?php echo Text::_('COM_USERS_RESET_REQUEST_LABEL'); ?><p>
+                <?php if (isset($fieldset->legend)) : ?>
+                    <legend><?php echo Text::_($fieldset->legend); ?></legend>
+                <?php endif; ?>
+                <?php if (isset($fieldset->description)) : ?>
+                    <p><?php echo Text::_($fieldset->description); ?></p>
+                <?php endif; ?>
                 <?php echo $this->form->renderFieldset($fieldset->name); ?>
             </fieldset>
         <?php endforeach; ?>