diff --git a/administrator/components/com_users/src/Model/UserModel.php b/administrator/components/com_users/src/Model/UserModel.php
index 1343df93fba0a..f43d37f687436 100644
--- a/administrator/components/com_users/src/Model/UserModel.php
+++ b/administrator/components/com_users/src/Model/UserModel.php
@@ -130,8 +130,10 @@ public function getForm($data = array(), $loadData = true)
 			return false;
 		}
 
+		$user = Factory::getUser();
+
 		// If the user needs to change their password, mark the password fields as required
-		if (Factory::getUser()->requireReset)
+		if ($user->requireReset)
 		{
 			$form->setFieldAttribute('password', 'required', 'true');
 			$form->setFieldAttribute('password2', 'required', 'true');
@@ -143,14 +145,33 @@ public function getForm($data = array(), $loadData = true)
 			$form->setFieldAttribute('language', 'type', 'frontend_language', 'params');
 		}
 
-		$userId = $form->getValue('id');
+		$userId = (int) $form->getValue('id');
 
 		// The user should not be able to set the requireReset value on their own account
-		if ((int) $userId === (int) Factory::getUser()->id)
+		if ($userId === (int) $user->id)
 		{
 			$form->removeField('requireReset');
 		}
 
+		/**
+		 * If users without core.manage permission editing their own account, remove some fields which they should
+		 * not be allowed to change and prevent them to change user name if configured
+		 */
+		if (!$user->authorise('core.manage', 'com_users') && (int) $user->id === $userId)
+		{
+			if (!ComponentHelper::getParams('com_users')->get('change_login_name'))
+			{
+				$form->setFieldAttribute('username', 'required', 'false');
+				$form->setFieldAttribute('username', 'readonly', 'true');
+				$form->setFieldAttribute('username', 'description', 'COM_USERS_USER_FIELD_NOCHANGE_USERNAME_DESC');
+			}
+
+			$form->removeField('lastResetTime');
+			$form->removeField('resetCount');
+			$form->removeField('sendEmail');
+			$form->removeField('block');
+		}
+
 		return $form;
 	}
 
diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini
index f2bfd6952dd29..8ab8a3e429368 100644
--- a/administrator/language/en-GB/com_users.ini
+++ b/administrator/language/en-GB/com_users.ini
@@ -339,6 +339,7 @@ COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_LABEL="Frontend Language"
 COM_USERS_USER_FIELD_LASTRESET_LABEL="Last Reset Date"
 COM_USERS_USER_FIELD_LASTVISIT_LABEL="Last Visit Date"
 COM_USERS_USER_FIELD_NAME_LABEL="Name"
+COM_USERS_USER_FIELD_NOCHANGE_USERNAME_DESC="If you want to change your Username, please contact a site administrator."
 COM_USERS_USER_FIELD_PASSWORD1_MESSAGE="The passwords you entered do not match. Please enter your desired password in the password field and confirm your entry by entering it in the confirm password field."
 COM_USERS_USER_FIELD_PASSWORD2_LABEL="Confirm Password"
 COM_USERS_USER_FIELD_REGISTERDATE_LABEL="Registration Date"