diff --git a/components/com_users/forms/registration.xml b/components/com_users/forms/registration.xml
index f77fe9a3572ea..3e31e10a6d2d3 100644
--- a/components/com_users/forms/registration.xml
+++ b/components/com_users/forms/registration.xml
@@ -12,7 +12,6 @@
 			name="name"
 			type="text"
 			label="COM_USERS_REGISTER_NAME_LABEL"
-			description="COM_USERS_REGISTER_NAME_DESC"
 			filter="string"
 			required="true"
 			size="30"
@@ -22,7 +21,6 @@
 			name="username"
 			type="text"
 			label="COM_USERS_REGISTER_USERNAME_LABEL"
-			description="COM_USERS_DESIRED_USERNAME"
 			class="validate-username"
 			filter="username"
 			message="COM_USERS_REGISTER_USERNAME_MESSAGE"
@@ -47,6 +45,7 @@
 			rules="true"
 			force="on"
 			filter="raw"
+			hiddenDescription="true"
 		/>
 
 		<field
@@ -67,7 +66,6 @@
 			name="email1"
 			type="email"
 			label="COM_USERS_REGISTER_EMAIL1_LABEL"
-			description="COM_USERS_REGISTER_EMAIL1_DESC"
 			field="id"
 			filter="string"
 			required="true"
@@ -82,7 +80,6 @@
 			name="captcha"
 			type="captcha"
 			label="COM_USERS_CAPTCHA_LABEL"
-			description="COM_USERS_CAPTCHA_DESC"
 			validate="captcha"
 		/>
 	</fieldset>
diff --git a/components/com_users/forms/remind.xml b/components/com_users/forms/remind.xml
index 6ca813968bb64..1fca77e64a72a 100644
--- a/components/com_users/forms/remind.xml
+++ b/components/com_users/forms/remind.xml
@@ -5,19 +5,17 @@
 			name="email"
 			type="email"
 			label="COM_USERS_FIELD_REMIND_EMAIL_LABEL"
-			description="COM_USERS_FIELD_REMIND_EMAIL_DESC"
 			required="true"
 			size="30"
 			validate="email"
 			autocomplete="email"
 		/>
-		
+
 		<field
 			name="captcha"
 			type="captcha"
 			label="COM_USERS_CAPTCHA_LABEL"
-			description="COM_USERS_CAPTCHA_DESC"
 			validate="captcha"
 		/>
 	</fieldset>
-</form>
\ No newline at end of file
+</form>
diff --git a/components/com_users/forms/reset_complete.xml b/components/com_users/forms/reset_complete.xml
index d23cb6fa6f4bf..904b3209895d3 100644
--- a/components/com_users/forms/reset_complete.xml
+++ b/components/com_users/forms/reset_complete.xml
@@ -5,27 +5,31 @@
 			name="password1"
 			type="password"
 			label="COM_USERS_FIELD_RESET_PASSWORD1_LABEL"
-			description="COM_USERS_FIELD_RESET_PASSWORD1_DESC"
+			description="JFIELD_PASSWORD_RULES_MINIMUM_REQUIREMENTS"
+			required="true"
 			autocomplete="new-password"
 			class="validate-password"
 			field="password2"
-			filter="raw"
-			message="COM_USERS_FIELD_RESET_PASSWORD1_MESSAGE"
-			required="true"
 			size="30"
-			validate="equals"
+			validate="password"
+			strengthmeter="true"
+			rules="true"
+			force="on"
+			filter="raw"
+			hiddenDescription="true"
 		/>
 		<field
 			name="password2"
 			type="password"
 			label="COM_USERS_FIELD_RESET_PASSWORD2_LABEL"
-			description="COM_USERS_FIELD_RESET_PASSWORD2_DESC"
 			autocomplete="new-password"
 			class="validate-password"
+			field="password1"
 			filter="raw"
-			required="true"
+			message="COM_USERS_FIELD_RESET_PASSWORD1_MESSAGE"
 			size="30"
-			validate="password"
+			validate="equals"
+			required="true"
 		/>
 	</fieldset>
 </form>
diff --git a/components/com_users/forms/reset_confirm.xml b/components/com_users/forms/reset_confirm.xml
index 2be151e26624e..9ba8cc02b28b5 100644
--- a/components/com_users/forms/reset_confirm.xml
+++ b/components/com_users/forms/reset_confirm.xml
@@ -5,7 +5,6 @@
 			name="username"
 			type="text"
 			label="COM_USERS_FIELD_RESET_CONFIRM_USERNAME_LABEL"
-			description="COM_USERS_FIELD_RESET_CONFIRM_USERNAME_DESC"
 			filter="username"
 			required="true"
 			size="30"
@@ -15,7 +14,6 @@
 			name="token"
 			type="text"
 			label="COM_USERS_FIELD_RESET_CONFIRM_TOKEN_LABEL"
-			description="COM_USERS_FIELD_RESET_CONFIRM_TOKEN_DESC"
 			filter="alnum"
 			required="true"
 			size="32"
diff --git a/components/com_users/forms/reset_request.xml b/components/com_users/forms/reset_request.xml
index df9297e3bedb0..95911ae2dbac3 100644
--- a/components/com_users/forms/reset_request.xml
+++ b/components/com_users/forms/reset_request.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
 	<fieldset name="default" label="COM_USERS_RESET_REQUEST_LABEL">
-		<field 
+		<field
 			name="email"
 			type="text"
 			label="COM_USERS_FIELD_PASSWORD_RESET_LABEL"
-			description="COM_USERS_FIELD_PASSWORD_RESET_DESC"
 			class="validate-username"
 			filter="email"
 			required="true"
@@ -16,8 +15,7 @@
 			name="captcha"
 			type="captcha"
 			label="COM_USERS_CAPTCHA_LABEL"
-			description="COM_USERS_CAPTCHA_DESC"
 			validate="captcha"
 		/>
 	</fieldset>
-</form>
\ No newline at end of file
+</form>
diff --git a/components/com_users/forms/sitelang.xml b/components/com_users/forms/sitelang.xml
index 9db913f9fc19b..1d6f07143c620 100644
--- a/components/com_users/forms/sitelang.xml
+++ b/components/com_users/forms/sitelang.xml
@@ -13,4 +13,4 @@
 			/>
 		</fieldset>
 	</fields>
-</form>
\ No newline at end of file
+</form>
diff --git a/components/com_users/layouts/joomla/form/renderfield.php b/components/com_users/layouts/joomla/form/renderfield.php
deleted file mode 100644
index 2828cfca4e256..0000000000000
--- a/components/com_users/layouts/joomla/form/renderfield.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * @package     Joomla.Site
- * @subpackage  Layout
- *
- * @copyright   Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-
-extract($displayData);
-
-/**
- * Layout variables
- * -----------------
- * @var   array   $options  Optional parameters
- * @var   string  $label    The html code for the label (not required if $options['hiddenLabel'] is true)
- * @var   string  $input    The input field html code
- */
-
-if (!empty($options['showonEnabled']))
-{
-	/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
-	$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
-	$wa->useScript('showon');
-}
-
-$class = empty($options['class']) ? '' : ' ' . $options['class'];
-$rel   = empty($options['rel']) ? '' : ' ' . $options['rel'];
-
-/**
- * @TODO:
- *
- * As mentioned in #8473 (https://github.com/joomla/joomla-cms/pull/8473), ...
- * as long as we cannot access the field properties properly, this seems to
- * be the way to go for now.
- *
- * On a side note: Parsing html is seldom a good idea.
- * https://stackoverflow.com/questions/1732348/regex-match-open-tags-except-xhtml-self-contained-tags/1732454#1732454
- */
-preg_match('/class=\"([^\"]+)\"/i', $input, $match);
-
-$required     = (strpos($input, 'aria-required="true"') !== false
-			|| (!empty($match[1]) && (strpos($match[1], 'required') !== false) || strpos($displayData['class'], 'required') !== false));
-$typeOfSpacer = (strpos($label, 'spacer-lbl') !== false);
-
-?>
-
-<div class="control-group<?php echo $class; ?>"<?php echo $rel; ?>>
-	<?php if (empty($options['hiddenLabel'])): ?>
-		<div class="control-label">
-			<?php echo $label; ?>
-		</div>
-	<?php endif; ?>
-	<div class="controls">
-		<?php echo $input; ?>
-	</div>
-</div>
diff --git a/language/en-GB/com_users.ini b/language/en-GB/com_users.ini
index 31d251e2611de..86d94ef11be7d 100644
--- a/language/en-GB/com_users.ini
+++ b/language/en-GB/com_users.ini
@@ -4,10 +4,8 @@
 ; Note : All ini files need to be saved as UTF-8
 
 COM_USERS_ACTIVATION_TOKEN_NOT_FOUND="Verification code not found. Check if your account is already activated and try to log in."
-COM_USERS_CAPTCHA_DESC="Please complete the security check."
 COM_USERS_CAPTCHA_LABEL="Captcha"
 COM_USERS_DATABASE_ERROR="Error getting the user from the database: %s"
-COM_USERS_DESIRED_USERNAME="Enter your desired username."
 COM_USERS_EDIT_PROFILE="Edit Profile"
 COM_USERS_EMAIL_ACCOUNT_DETAILS="Account Details for %s at %s"
 COM_USERS_EMAIL_ACTIVATE_WITH_ADMIN_ACTIVATION_BODY="Hello administrator,\n\nA new user has registered at %s.\nThe user has verified their email address and requests that you approve their account.\nThis email has their details:\n\n  Name :  %s \n  email:  %s \n Username:  %s \n\nYou can activate the user by selecting on the link below:\n %s \n"
@@ -26,11 +24,8 @@ COM_USERS_EMAIL_REGISTERED_WITH_ADMIN_ACTIVATION_BODY_NOPW="Hello %s,\n\nThank y
 COM_USERS_EMAIL_USERNAME_REMINDER_BODY="Hello,\n\nA username reminder has been requested for your {SITENAME} account.\n\nYour username is {USERNAME}.\n\nTo login to your account, select the link below.\n\n{LINK_TEXT} \n\nThank you."
 COM_USERS_EMAIL_USERNAME_REMINDER_SUBJECT="Your {SITENAME} username"
 COM_USERS_ERROR_SECRET_CODE_WITHOUT_TFA="You have entered a Secret Code but two factor authentication is not enabled in your user account. If you want to use a secret code to secure your login please edit your user profile and enable two factor authentication."
-COM_USERS_FIELD_PASSWORD_RESET_DESC="Please enter the email address associated with your User account.<br>A verification code will be sent to you. Once you have received the verification code, you will be able to choose a new password for your account."
 COM_USERS_FIELD_PASSWORD_RESET_LABEL="Email Address"
-COM_USERS_FIELD_REMIND_EMAIL_DESC="Please enter the email address associated with your User account.<br>Your username will be emailed to the email address on file."
 COM_USERS_FIELD_REMIND_EMAIL_LABEL="Email Address"
-COM_USERS_FIELD_RESET_CONFIRM_TOKEN_DESC="Enter the password reset verification code you received by email."
 COM_USERS_FIELD_RESET_CONFIRM_TOKEN_LABEL="Verification Code"
 COM_USERS_FIELD_RESET_CONFIRM_USERNAME_LABEL="Username"
 COM_USERS_FIELD_RESET_PASSWORD1_LABEL="Password"
diff --git a/plugins/user/profile/profile.php b/plugins/user/profile/profile.php
index 70d3be5730bee..ea142d3260939 100644
--- a/plugins/user/profile/profile.php
+++ b/plugins/user/profile/profile.php
@@ -264,23 +264,6 @@ public function onContentPrepareForm(Form $form, $data)
 			'tos',
 		];
 
-		// Change fields description when displayed in frontend or backend profile editing
-		if ($this->app->isClient('site') || $name === 'com_users.user' || $name === 'com_admin.profile')
-		{
-			$form->setFieldAttribute('address1', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
-			$form->setFieldAttribute('address2', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
-			$form->setFieldAttribute('city', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
-			$form->setFieldAttribute('region', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
-			$form->setFieldAttribute('country', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
-			$form->setFieldAttribute('postal_code', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
-			$form->setFieldAttribute('phone', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
-			$form->setFieldAttribute('website', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
-			$form->setFieldAttribute('favoritebook', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
-			$form->setFieldAttribute('aboutme', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
-			$form->setFieldAttribute('dob', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
-			$form->setFieldAttribute('tos', 'description', 'PLG_USER_PROFILE_FIELD_TOS_DESC_SITE', 'profile');
-		}
-
 		$tosArticle = $this->params->get('register_tos_article');
 		$tosEnabled = $this->params->get('register-require_tos', 0);