diff --git a/src/components/misc/user.vue b/src/components/misc/user.vue
index e32ff6c62..b59084cce 100644
--- a/src/components/misc/user.vue
+++ b/src/components/misc/user.vue
@@ -48,7 +48,6 @@ const displayName = computed(() => getDisplayName(props.user))
 
 <style lang="scss" scoped>
 .user {
-	margin: .5rem;
 	display: flex;
 	justify-items: center;
 
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index ac2dcc9f4..6dbd714f8 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -20,7 +20,8 @@
 						:user="n.notification.doer"
 						:show-username="false"
 						:avatar-size="16"
-						v-if="n.notification.doer"/>
+						v-if="n.notification.doer"
+					/>
 					<div class="detail">
 						<div>
 							<span class="has-text-weight-bold mr-1" v-if="n.notification.doer">
diff --git a/src/components/tasks/partials/editAssignees.vue b/src/components/tasks/partials/editAssignees.vue
index d9f9f5aa0..c9c9a1a0f 100644
--- a/src/components/tasks/partials/editAssignees.vue
+++ b/src/components/tasks/partials/editAssignees.vue
@@ -12,12 +12,15 @@
 	>
 		<template #tag="{item: user}">
 			<span class="assignee">
-				<user :avatar-size="32" :show-username="false" :user="user"/>
+				<user :avatar-size="32" :show-username="false" :user="user" class="m-2"/>
 				<BaseButton @click="removeAssignee(user)" class="remove-assignee" v-if="!disabled">
 					<icon icon="times"/>
 				</BaseButton>
 			</span>
 		</template>
+		<template #searchResult="{option: user}">
+			<user :avatar-size="24" :show-username="true" :user="user"/>
+		</template>
 	</Multiselect>
 </template>
 
@@ -104,11 +107,6 @@ async function removeAssignee(user: IUser) {
 }
 
 async function findUser(query: string) {
-	if (query === '') {
-		foundUsers.value = []
-		return
-	}
-
 	const response = await projectUserService.getAll({projectId: props.projectId}, {s: query}) as IUser[]
 
 	// Filter the results to not include users who are already assigned
diff --git a/src/components/tasks/partials/singleTaskInProject.vue b/src/components/tasks/partials/singleTaskInProject.vue
index 32485d772..0702b2496 100644
--- a/src/components/tasks/partials/singleTaskInProject.vue
+++ b/src/components/tasks/partials/singleTaskInProject.vue
@@ -56,6 +56,7 @@
 				:key="task.id + 'assignee' + a.id + i"
 				:show-username="false"
 				:user="a"
+				class="m-2"
 			/>
 
 			<!-- FIXME: use popup -->
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index 6faaed9fb..d8ddf2ad6 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -76,8 +76,8 @@
         "savedSuccess": "The settings were successfully updated.",
         "emailReminders": "Send me reminders for tasks via Email",
         "overdueReminders": "Send me a summary of my undone overdue tasks every day",
-        "discoverableByName": "Let other users find me when they search for my name",
-        "discoverableByEmail": "Let other users find me when they search for my full email",
+        "discoverableByName": "Allow other users to add me as a member to teams or projects when they search for my name",
+        "discoverableByEmail": "Allow other users to add me as a member to teams or projects when they search for my full email",
         "playSoundWhenDone": "Play a sound when marking tasks as done",
         "weekStart": "Week starts on",
         "weekStartSunday": "Sunday",
diff --git a/src/modules/parseTaskText.test.ts b/src/modules/parseTaskText.test.ts
index e9fe5b56f..6464b2162 100644
--- a/src/modules/parseTaskText.test.ts
+++ b/src/modules/parseTaskText.test.ts
@@ -691,6 +691,14 @@ describe('Parse Task Text', () => {
 			expect(result.assignees).toHaveLength(1)
 			expect(result.assignees[0]).toBe('today')
 		})
+		it('should recognize an email address', () => {
+			const text = 'Lorem Ipsum @email@example.com'
+			const result = parseTaskText(text)
+
+			expect(result.text).toBe('Lorem Ipsum @email@example.com')
+			expect(result.assignees).toHaveLength(1)
+			expect(result.assignees[0]).toBe('email@example.com')
+		})
 	})
 
 	describe('Recurring Dates', () => {
diff --git a/src/modules/parseTaskText.ts b/src/modules/parseTaskText.ts
index 53fa34e9c..0b4044d1c 100644
--- a/src/modules/parseTaskText.ts
+++ b/src/modules/parseTaskText.ts
@@ -109,7 +109,9 @@ const getItemsFromPrefix = (text: string, prefix: string): string[] => {
 			return
 		}
 
-		p = p.replace(prefix, '')
+		if (p.startsWith(prefix)) {
+			p = p.substring(1)
+		}
 
 		let itemText
 		if (p.charAt(0) === '\'') {
@@ -120,8 +122,8 @@ const getItemsFromPrefix = (text: string, prefix: string): string[] => {
 			// Only until the next space
 			itemText = p.split(' ')[0]
 		}
-		
-		if(itemText !== '')  {
+
+		if (itemText !== '') {
 			items.push(itemText)
 		}
 	})
@@ -278,13 +280,16 @@ const getRepeats = (text: string): repeatParsedResult => {
 
 export const cleanupItemText = (text: string, items: string[], prefix: string): string => {
 	items.forEach(l => {
+		if (l === '') {
+			return
+		}
 		text = text
-			.replace(`${prefix}'${l}' `, '')
-			.replace(`${prefix}'${l}'`, '')
-			.replace(`${prefix}"${l}" `, '')
-			.replace(`${prefix}"${l}"`, '')
-			.replace(`${prefix}${l} `, '')
-			.replace(`${prefix}${l}`, '')
+			.replace(new RegExp(`\\${prefix}'${l}' `, 'ig'), '')
+			.replace(new RegExp(`\\${prefix}'${l}'`, 'ig'), '')
+			.replace(new RegExp(`\\${prefix}"${l}" `, 'ig'), '')
+			.replace(new RegExp(`\\${prefix}"${l}"`, 'ig'), '')
+			.replace(new RegExp(`\\${prefix}${l} `, 'ig'), '')
+			.replace(new RegExp(`\\${prefix}${l}`, 'ig'), '')
 	})
 	return text
 }
diff --git a/src/stores/tasks.ts b/src/stores/tasks.ts
index 4dbee906d..40e7f1bd1 100644
--- a/src/stores/tasks.ts
+++ b/src/stores/tasks.ts
@@ -5,7 +5,6 @@ import router from '@/router'
 import TaskService from '@/services/task'
 import TaskAssigneeService from '@/services/taskAssignee'
 import LabelTaskService from '@/services/labelTask'
-import UserService from '@/services/user'
 
 import {playPop} from '@/helpers/playPop'
 import {getQuickAddMagicMode} from '@/helpers/quickAddMagicMode'
@@ -29,12 +28,21 @@ import {useProjectStore} from '@/stores/projects'
 import {useAttachmentStore} from '@/stores/attachments'
 import {useKanbanStore} from '@/stores/kanban'
 import {useBaseStore} from '@/stores/base'
+import ProjectUserService from '@/services/projectUsers'
+
+interface MatchedAssignee extends IUser {
+	match: string,
+}
 
 // IDEA: maybe use a small fuzzy search here to prevent errors
-function findPropertyByValue(object, key, value) {
-	return Object.values(object).find(
-		(l) => l[key]?.toLowerCase() === value.toLowerCase(),
-	)
+function findPropertyByValue(object, key, value, fuzzy = false) {
+	return Object.values(object).find(l => {
+		if (fuzzy) {
+			return l[key]?.toLowerCase().includes(value.toLowerCase())
+		}
+	
+		return l[key]?.toLowerCase() === value.toLowerCase()
+	})
 }
 
 // Check if the user exists in the search results
@@ -42,9 +50,19 @@ function validateUser(
 	users: IUser[],
 	query: IUser['username'] | IUser['name'] | IUser['email'],
 ) {
-	return findPropertyByValue(users, 'username', query) ||
+	if (users.length === 1) {
+		return (
+			findPropertyByValue(users, 'username', query, true) ||
+			findPropertyByValue(users, 'name', query, true) ||
+			findPropertyByValue(users, 'email', query, true)
+		)
+	}
+	
+	return (
+		findPropertyByValue(users, 'username', query) ||
 		findPropertyByValue(users, 'name', query) ||
 		findPropertyByValue(users, 'email', query)
+	)
 }
 
 // Check if the label exists
@@ -63,14 +81,18 @@ async function addLabelToTask(task: ITask, label: ILabel) {
 	return response
 }
 
-async function findAssignees(parsedTaskAssignees: string[]): Promise<IUser[]> {
+async function findAssignees(parsedTaskAssignees: string[], projectId: number): Promise<MatchedAssignee[]> {
 	if (parsedTaskAssignees.length <= 0) {
 		return []
 	}
 
-	const userService = new UserService()
+	const userService = new ProjectUserService()
 	const assignees = parsedTaskAssignees.map(async a => {
-		const users = await userService.getAll({}, {s: a})
+		const users = (await userService.getAll({projectId}, {s: a}))
+			.map(u => ({
+				...u,
+				match: a,
+			}))
 		return validateUser(users, a)
 	})
 
@@ -388,15 +410,15 @@ export const useTaskStore = defineStore('task', () => {
 			cancel()
 			throw new Error('NO_PROJECT')
 		}
-	
-		const assignees = await findAssignees(parsedTask.assignees)
-		
+
+		const assignees = await findAssignees(parsedTask.assignees, foundProjectId)
+
 		// Only clean up those assignees from the task title which actually exist
 		let cleanedTitle = parsedTask.text
 		if (assignees.length > 0) {
 			const assigneePrefix = PREFIXES[quickAddMagicMode]?.assignee
 			if (assigneePrefix) {
-				cleanedTitle = cleanupItemText(cleanedTitle, assignees.map(a  => a.username), assigneePrefix)
+				cleanedTitle = cleanupItemText(cleanedTitle, assignees.map(a  => a.match), assigneePrefix)
 			}
 		}