diff --git a/src/components/EntryForm.test.ts b/src/components/EntryForm.test.ts
index 347412a..be2ae37 100644
--- a/src/components/EntryForm.test.ts
+++ b/src/components/EntryForm.test.ts
@@ -77,29 +77,65 @@ describe('Entry Form tests', () => {
 		expect(button.text()).toBe('Edit')
 	})
 
-	it('displays nothing when the form is valid and processed', () => {
+	it('displays nothing when the form is valid and processed', async () => {
 		const { name, text } = getSampleValues()
 		const component = mount(EntryForm)
 		const { nameField, textField } = getFormFields(component)
-		const [button, errorSpan] = getAdditionalElements(component, 'button', 'span')
+		const [button] = getAdditionalElements(component, 'button')
+
+		await nameField.setValue(name)
+		await textField.setValue(text)
+
+		await button.trigger('click')
+		const errorSpans = component.findAll('[data-test="error-msg"]')
+
+		expect(errorSpans.length).toBe(0)
+	})
+
+	it('displays that the name is missing when no name is entered', async () => {
+		const { text } = getSampleValues()
+		const component = mount(EntryForm)
+		const { textField } = getFormFields(component)
+		const [button] = getAdditionalElements(component, 'button')
 
-		nameField.element.value = name
 		textField.element.value = text
 
-		button.trigger('click')
-		expect(errorSpan.text()).toBe('')
+		await button.trigger('click')
+		const errorSpans = component.findAll('[data-test="error-msg"]')
+
+		expect(errorSpans.length).toBe(1)
+		expect(errorSpans[0].text()).toBe('* name is required')
 	})
 
-	it('displays that the name is missing when no name is entered', () => {
-		const { name } = getSampleValues()
-		const component = mount(EntryForm)
-		const { nameField }  = getFormFields(component)
-		const [button, errorSpan] = getAdditionalElements(component, 'button', 'span')
+	it('displays error that the name is not unique when there is another entry in the passed entries with the same name', async () => {
+		const { text } = getSampleValues()
+		const component = mount(EntryForm, {props: {entries: [<Entry>{name: 'something', text: 'something else'}]}})
+		const { textField, nameField } = getFormFields(component)
+		const [button] = getAdditionalElements(component, 'button')
 
-		nameField.element.value = name
+		await textField.setValue(text)
+		await nameField.setValue('something')
 
-		button.trigger('click')
-		expect(errorSpan.text()).toBe('name is required')
+		await button.trigger('click')
+		const errorSpans = component.findAll('[data-test="error-msg"]')
+
+		expect(errorSpans.length).toBe(1)
+		expect(errorSpans[0].text()).toBe('* name must be unique')
 	})
 
+	it('fires submit when there is no issue with the inputted data', async() => {
+		const { text } = getSampleValues()
+		const component = mount(EntryForm, {props: {entries: [<Entry>{name: 'something', text: 'something else'}]}})
+		const { textField, nameField } = getFormFields(component)
+		const [button] = getAdditionalElements(component, 'button')
+
+		await textField.setValue(text)
+		await nameField.setValue('something else')
+
+		await button.trigger('click')
+		const errorSpans = component.findAll('[data-test="error-msg"]')
+
+		expect(errorSpans.length).toBe(0)
+		expect(component.emitted('submit'))
+	})
 })
\ No newline at end of file
diff --git a/src/components/EntryForm.vue b/src/components/EntryForm.vue
index c89862d..da7f94c 100644
--- a/src/components/EntryForm.vue
+++ b/src/components/EntryForm.vue
@@ -13,17 +13,18 @@ const emit = defineEmits<{
 const props = withDefaults(defineProps<{
 	action?: 'create' | 'edit'
 	inputEntry?: Entry | undefined
+	entries?: Entry[]
 }>(), {
-	action: 'create'
+	action: 'create',
 })
 
 const nameField = ref(props.inputEntry ? props.inputEntry.name : '')
 const textField = ref(props.inputEntry ? props.inputEntry.text : '')
-const errorMessage: Ref<string | undefined> = ref(undefined)
+const issues: Ref<Array<string>> = ref([])
 
 const createEntrySchema = z.object({
-	name: z.string({required_error: 'name is required'}),
-	text: z.string().optional()
+	name: z.string().trim().min(1, { message: 'name is required' }),
+	text: z.string().trim().optional()
 })
 
 export type CreateEntrySchema = z.infer<typeof createEntrySchema>
@@ -35,9 +36,19 @@ function submit() {
 		text: textField.value
 	})
 
+
 	if (result.success) {
-		emit('submit', result.data)
+		const isUnique = props.entries === undefined
+			|| !props.entries.map(entry => entry.name).includes(result.data.name)
+
+		if (isUnique) {
+			emit('submit', result.data)
+			return
+		}
+
+		issues.value = ['name must be unique']
 	} else {
+		issues.value = result.error.issues.map(issue => issue.message)
 	}
 }
 
@@ -45,14 +56,16 @@ function submit() {
 </script>
 
 <template>
-	<form class="flex gap-3 flex-col">
-		<span>{{ errorMessage }}</span>
+	<div class="flex gap-3 flex-col">
+		<div >
+			<span v-for="issue of issues" data-test="error-msg" class="text-red-800"> * {{ issue }}</span>
+		</div>
 
 		<Input placeholder="Name" v-model:model-value="nameField" />
 		<Textarea placeholder="Text" v-model:model-value="textField" />
 		<Button class="w-full" v-if="props.action === 'create'" @click="submit()">Create</Button>
 		<Button class="w-full" v-else @click="submit()">Edit</Button>
-	</form>
+	</div>
 </template>
 
 <style scoped></style>
\ No newline at end of file
diff --git a/src/pages/Home.vue b/src/pages/Home.vue
index 7cee424..08f3c0d 100644
--- a/src/pages/Home.vue
+++ b/src/pages/Home.vue
@@ -79,7 +79,7 @@ function openDetailWithName(name: string) {
 				<DialogTitle> Create new Entry </DialogTitle>
 			</DialogHeader>
 			<div class="p-5">
-				<EntryForm action="create" @submit="(val) => createEntry(val)"> </EntryForm>
+				<EntryForm action="create" @submit="(val) => createEntry(val)" :entries="entries"> </EntryForm>
 			</div>
 		</DialogContent>
 	</Dialog>
@@ -90,7 +90,7 @@ function openDetailWithName(name: string) {
 				<DrawerTitle>Create new Entry</DrawerTitle>
 			</DrawerHeader>
 			<div class="p-5">
-				<EntryForm action="create" @submit="(val) => createEntry(val)"> </EntryForm>
+				<EntryForm action="create" @submit="(val) => createEntry(val)" :entries="entries"> </EntryForm>
 			</div>
 		</DrawerContent>
 	</Drawer>