diff --git a/src/components/map/ClickSearchPopup.vue b/src/components/map/ClickSearchPopup.vue
index 8674e783e..496ffd1e0 100644
--- a/src/components/map/ClickSearchPopup.vue
+++ b/src/components/map/ClickSearchPopup.vue
@@ -12,7 +12,7 @@
 			<span class="icon-favorite" />
 			{{ t('maps', 'Add to favorites') }}
 		</button>
-		<button v-if="contactIsCreatable" class="search-place-contact" @click="onPlaceContact">
+		<button v-if="contactIsCreatable" class="search-place-contact" @click.stop="onPlaceContact">
 			<span class="icon-user" />
 			{{ t('maps', 'Add contact address') }}
 		</button>
diff --git a/src/components/map/PlaceContactPopup.vue b/src/components/map/PlaceContactPopup.vue
index 5d459388f..f5815643c 100644
--- a/src/components/map/PlaceContactPopup.vue
+++ b/src/components/map/PlaceContactPopup.vue
@@ -20,7 +20,7 @@
 				v-model="selectedContact"
 				class="contact-input"
 				track-by="URI"
-				inputLabel="FN"
+				label="FN"
 				:placeholder="t('maps', 'Choose a contact')"
 				:options="contactData"
 				:internal-search="true"
@@ -54,7 +54,7 @@
 		<button class="submit-place-contact"
 			:disabled="!selectedContact"
 			:class="{ loading: searchingEditedAddress }"
-			@click="onValidate">
+			@click.stop="onValidate">
 			<span class="icon-add" />
 			{{ t('maps', 'Add address to contact') }}
 		</button>
@@ -109,7 +109,7 @@ export default {
 				? this.getContactAvatar(this.selectedContact)
 					? this.getContactAvatar(this.selectedContact)
 					: generateUrl('/apps/maps/contacts-avatar?name=' + encodeURIComponent(this.selectedContact.FN))
-				: generateUrl('/svg/core/actions/user?color=000000')
+				: generateUrl('/apps/maps/contacts-avatar?name=')
 		},
 		markerIcon() {
 			return L.icon({