diff --git a/apps/settings/src/components/AdminSettingsSharingForm.vue b/apps/settings/src/components/AdminSettingsSharingForm.vue
index 122b3dfc642..cd723b73c77 100644
--- a/apps/settings/src/components/AdminSettingsSharingForm.vue
+++ b/apps/settings/src/components/AdminSettingsSharingForm.vue
@@ -160,17 +160,17 @@
 			<NcCheckboxRadioSwitch type="switch"
 				aria-controls="settings-sharing-privacy-user-enumeration"
 				:checked.sync="settings.allowShareDialogUserEnumeration">
-				{{ t('settings', 'Allow username autocompletion in share dialog and allow access to the system address book') }}
+				{{ t('settings', 'Allow account name autocompletion in share dialog and allow access to the system address book') }}
 			</NcCheckboxRadioSwitch>
 			<fieldset v-show="settings.allowShareDialogUserEnumeration" id="settings-sharing-privacy-user-enumeration" class="sharing__sub-section">
 				<em>
 					{{ t('settings', 'If autocompletion "same group" and "phone number integration" are enabled a match in either is enough to show the user.') }}
 				</em>
 				<NcCheckboxRadioSwitch :checked.sync="settings.restrictUserEnumerationToGroup">
-					{{ t('settings', 'Allow username autocompletion to users within the same groups and limit system address books to users in the same groups') }}
+					{{ t('settings', 'Allow account name autocompletion to users within the same groups and limit system address books to users in the same groups') }}
 				</NcCheckboxRadioSwitch>
 				<NcCheckboxRadioSwitch :checked.sync="settings.restrictUserEnumerationToPhone">
-					{{ t('settings', 'Allow username autocompletion to users based on phone number integration') }}
+					{{ t('settings', 'Allow account name autocompletion to users based on phone number integration') }}
 				</NcCheckboxRadioSwitch>
 			</fieldset>
 
diff --git a/apps/settings/src/components/Users/NewUserModal.vue b/apps/settings/src/components/Users/NewUserModal.vue
index 236bc6db7d8..249baa6faf0 100644
--- a/apps/settings/src/components/Users/NewUserModal.vue
+++ b/apps/settings/src/components/Users/NewUserModal.vue
@@ -220,9 +220,9 @@ export default {
 
 		usernameLabel() {
 			if (this.settings.newUserGenerateUserID) {
-				return t('settings', 'Username will be autogenerated')
+				return t('settings', 'Account name will be autogenerated')
 			}
-			return t('settings', 'Username (required)')
+			return t('settings', 'Account name (required)')
 		},
 
 		minPasswordLength() {
diff --git a/apps/settings/src/components/Users/UserListHeader.vue b/apps/settings/src/components/Users/UserListHeader.vue
index 51212239fc0..8568f426ac2 100644
--- a/apps/settings/src/components/Users/UserListHeader.vue
+++ b/apps/settings/src/components/Users/UserListHeader.vue
@@ -40,7 +40,7 @@
 			data-cy-user-list-header-username
 			scope="col">
 			<span>
-				{{ t('settings', 'Username') }}
+				{{ t('settings', 'Account name') }}
 			</span>
 		</th>
 		<th class="header__cell"