diff --git a/apps/dav/lib/CardDAV/Converter.php b/apps/dav/lib/CardDAV/Converter.php
index c8add1b96a6e9..b3d8b094d6931 100644
--- a/apps/dav/lib/CardDAV/Converter.php
+++ b/apps/dav/lib/CardDAV/Converter.php
@@ -92,7 +92,19 @@ public function createCardFromUser(IUser $user): ?VCard {
 					$vCard->add(new Text($vCard, 'TEL', $property->getValue(), ['TYPE' => 'VOICE', 'X-NC-SCOPE' => $scope]));
 					break;
 				case IAccountManager::PROPERTY_ADDRESS:
-					$vCard->add(new Text($vCard, 'ADR', $property->getValue(), ['TYPE' => 'OTHER', 'X-NC-SCOPE' => $scope]));
+					// structured prop: https://www.rfc-editor.org/rfc/rfc6350.html#section-6.3.1
+					// post office box;extended address;street address;locality;region;postal code;country
+					$vCard->add(
+						new Text(
+							$vCard,
+							'ADR',
+							[ '', '', '', $property->getValue(), '', '', ''	],
+							[
+								'TYPE' => 'OTHER',
+								'X-NC-SCOPE' => $scope,
+							]
+						)
+					);
 					break;
 				case IAccountManager::PROPERTY_TWITTER:
 					$vCard->add(new Text($vCard, 'X-SOCIALPROFILE', $property->getValue(), ['TYPE' => 'TWITTER', 'X-NC-SCOPE' => $scope]));
diff --git a/apps/settings/src/components/PersonalInfo/LocationSection.vue b/apps/settings/src/components/PersonalInfo/LocationSection.vue
index ceef7c432cdef..57811ddf3b094 100644
--- a/apps/settings/src/components/PersonalInfo/LocationSection.vue
+++ b/apps/settings/src/components/PersonalInfo/LocationSection.vue
@@ -23,7 +23,7 @@
 <template>
 	<AccountPropertySection v-bind.sync="location"
 		autocomplete="address-level1"
-		:placeholder="t('settings', 'Your location')" />
+		:placeholder="t('settings', 'Your city')" />
 </template>
 
 <script>