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/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/complete.php b/components/com_users/tmpl/reset/complete.php
index 13fe66290e8dc..5abe216a2ad87 100644
--- a/components/com_users/tmpl/reset/complete.php
+++ b/components/com_users/tmpl/reset/complete.php
@@ -32,9 +32,8 @@
     <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; ?>
+                <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..d970da2bc4785 100644
--- a/components/com_users/tmpl/reset/confirm.php
+++ b/components/com_users/tmpl/reset/confirm.php
@@ -32,9 +32,8 @@
     <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; ?>
+                <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; ?>
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; ?>