diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index cdfd9e386..4d7d9ad3f 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -846,6 +846,7 @@
       "userAddedSuccess": "The team member was successfully added.",
       "madeMember": "The team member was successfully made member.",
       "madeAdmin": "The team member was successfully made admin.",
+      "mustSelectUser": "Please select a user.",
       "delete": {
         "header": "Delete the team",
         "text1": "Are you sure you want to delete this team and all of its members?",
diff --git a/src/views/teams/EditTeam.vue b/src/views/teams/EditTeam.vue
index 8c6fbab1c..247812f63 100644
--- a/src/views/teams/EditTeam.vue
+++ b/src/views/teams/EditTeam.vue
@@ -22,7 +22,7 @@
 				</div>
 				<p
 					class="help is-danger"
-					v-if="showError && team.name === ''"
+					v-if="showErrorTeamnameRequired && team.name === ''"
 				>
 					{{ $t('team.attributes.nameRequired') }}
 				</p>
@@ -81,6 +81,9 @@
 						</x-button>
 					</div>
 				</div>
+				<p class="help is-danger" v-if="showMustSelectUserError">
+					{{ $t('team.edit.mustSelectUser') }}
+				</p>
 			</div>
 			<table class="table has-actions is-striped is-hoverable is-fullwidth">
 				<tbody>
@@ -228,7 +231,8 @@ const foundUsers = ref<IUser[]>()
 const showDeleteModal = ref(false)
 const showUserDeleteModal = ref(false)
 const showLeaveModal = ref(false)
-const showError = ref(false)
+const showErrorTeamnameRequired = ref(false)
+const showMustSelectUserError = ref(false)
 
 const title = ref('')
 
@@ -242,10 +246,10 @@ async function loadTeam() {
 
 async function save() {
 	if (team.value?.name === '') {
-		showError.value = true
+		showErrorTeamnameRequired.value = true
 		return
 	}
-	showError.value = false
+	showErrorTeamnameRequired.value = false
 
 	team.value = await teamService.value.update(team.value)
 	success({message: t('team.edit.success')})
@@ -271,10 +275,16 @@ async function deleteMember() {
 }
 
 async function addUser() {
+	showMustSelectUserError.value = false
+	if(!newMember.value) {
+		showMustSelectUserError.value = true
+		return
+	}
 	await teamMemberService.value.create({
 		teamId: teamId.value,
 		username: newMember.value.username,
 	})
+	newMember.value = null
 	await loadTeam()
 	success({message: t('team.edit.userAddedSuccess')})
 }