diff --git a/.gitmodules b/.gitmodules
index ce19da40ee647..e69de29bb2d1d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "3rdparty"]
-	path = 3rdparty
-	url = https://github.com/nextcloud/3rdparty.git
diff --git a/3rdparty b/3rdparty
deleted file mode 160000
index 020d0d3892bd3..0000000000000
--- a/3rdparty
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 020d0d3892bd3b7296db8ed21448c834d33d5723
diff --git a/apps/settings/css/settings.scss b/apps/settings/css/settings.scss
index 9f0ab432cc7aa..0c0a7051ae70e 100644
--- a/apps/settings/css/settings.scss
+++ b/apps/settings/css/settings.scss
@@ -1650,6 +1650,10 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
 					-webkit-box-orient: vertical;
 				}
 
+				&.name .subtitle {
+					color: var(--color-main-text);
+				}
+
 				&.quota {
 					display: flex;;
 					justify-content: left;
diff --git a/apps/settings/src/components/UserList.vue b/apps/settings/src/components/UserList.vue
index 4d50da625966a..f749a747e33a9 100644
--- a/apps/settings/src/components/UserList.vue
+++ b/apps/settings/src/components/UserList.vue
@@ -156,11 +156,12 @@
 			class="row">
 			<div id="headerAvatar" class="avatar" />
 			<div id="headerName" class="name">
-				{{ t('settings', 'Username') }}
-
 				<div class="subtitle">
-					{{ t('settings', 'Display name') }}
+					<strong>
+						{{ t('settings', 'Display name') }}
+					</strong>
 				</div>
+				{{ t('settings', 'Username') }}
 			</div>
 			<div id="headerPassword" class="password">
 				{{ t('settings', 'Password') }}
diff --git a/apps/settings/src/components/UserList/UserRowSimple.vue b/apps/settings/src/components/UserList/UserRowSimple.vue
index 8b3472cf3fa9e..a6420a00b539c 100644
--- a/apps/settings/src/components/UserList/UserRowSimple.vue
+++ b/apps/settings/src/components/UserList/UserRowSimple.vue
@@ -11,12 +11,14 @@
 		</div>
 		<!-- dirty hack to ellipsis on two lines -->
 		<div class="name">
-			{{ user.id }}
 			<div class="displayName subtitle">
 				<div v-tooltip="user.displayname.length > 20 ? user.displayname : ''" class="cellText">
-					{{ user.displayname }}
+					<strong>
+						{{ user.displayname }}
+					</strong>
 				</div>
 			</div>
+			{{ user.id }}
 		</div>
 		<div />
 		<div class="mailAddress">