diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 7eb6c9238fc0f9c790d73bc3605d8c26ac0b914f..58c500f5f41e44dc0381df2b8c1e42d833133e37 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -32,7 +32,7 @@
 			:placeholder="$t('calendar', 'Share with users or groups')"
 			class="sharing-search__select"
 			:class="{ 'showContent': inputGiven, 'icon-loading': isLoading }"
-			:user-select="true"
+			:user-select="false"
 			open-direction="above"
 			track-by="user"
 			label="displayName"
@@ -45,7 +45,7 @@
 
 <script>
 import { NcSelect } from '@nextcloud/vue'
-import { principalPropertySearchByDisplaynameOrEmail } from '../../../services/caldavService.js'
+import { principalPropertySearch } from '../../../services/caldavService.js'
 import HttpClient from '@nextcloud/axios'
 import debounce from 'debounce'
 import { generateOcsUrl } from '@nextcloud/router'
@@ -113,15 +113,13 @@ export default {
 			this.usersOrGroups = []
 
 			if (query.length > 0) {
-				const davPromise = this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
-				const ocsPromise = this.findShareesFromCircles(query, hiddenPrincipalSchemes, hiddenUrls)
-
-				const [davResults, ocsResults] = await Promise.all([davPromise, ocsPromise])
-				this.usersOrGroups = [
-					...davResults,
-					...ocsResults,
-				]
-
+				try {
+					const davResults = await this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
+					this.usersOrGroups = [...davResults]
+				} catch (error) {
+					console.error('Error fetching data:', error)
+					this.usersOrGroups = [] // or handle error as needed
+				}
 				this.isLoading = false
 				this.inputGiven = true
 			} else {
@@ -139,11 +137,12 @@ export default {
 		async findShareesFromDav(query, hiddenPrincipals, hiddenUrls) {
 			let results
 			try {
-				results = await principalPropertySearchByDisplaynameOrEmail(query)
+				results = await principalPropertySearch([{
+					name: ['http://sabredav.org/ns', 'email-address'],
+				}], query, 'anyof')
 			} catch (error) {
 				return []
 			}
-
 			return results.reduce((list, result) => {
 				if (['ROOM', 'RESOURCE'].includes(result.calendarUserType)) {
 					return list
@@ -152,7 +151,7 @@ export default {
 				const isGroup = result.calendarUserType === 'GROUP'
 
 				// TODO: Why do we have to decode those two values?
-				const user = urldecode(result[isGroup ? 'groupId' : 'userId'])
+				const user = urldecode(result[isGroup ? 'groupId' : 'email'])
 				const decodedPrincipalScheme = urldecode(result.principalScheme)
 
 				if (hiddenPrincipals.includes(decodedPrincipalScheme)) {
@@ -166,11 +165,11 @@ export default {
 				if (!['GROUP', 'INDIVIDUAL'].includes(result.calendarUserType)) {
 					return list
 				}
-
 				list.push({
 					user,
-					displayName: result.displayname,
+					displayName: user,
 					uri: decodedPrincipalScheme,
+					icon: 'icon-circle',
 					isGroup,
 					isCircle: false,
 					isNoUser: isGroup,
diff --git a/src/services/caldavService.js b/src/services/caldavService.js
index 6130fb53d052e90fe92d1da48131a4f475af7cbe..5eeb72a787dee1e54967913d36beace3e8e57424 100644
--- a/src/services/caldavService.js
+++ b/src/services/caldavService.js
@@ -255,6 +255,10 @@ const advancedPrincipalPropertySearch = async (query) => {
 	return getClient().advancedPrincipalPropertySearch(query)
 }
 
+const principalPropertySearch = async (props, match, test) => {
+	return getClient().principalPropertySearch(props, match, test)
+}
+
 /**
  * Finds one principal by it's URL
  *
@@ -280,5 +284,6 @@ export {
 	getCurrentUserPrincipal,
 	principalPropertySearchByDisplaynameOrEmail,
 	advancedPrincipalPropertySearch,
+	principalPropertySearch,
 	findPrincipalByUrl,
 }