diff --git a/apps/settings/src/components/Users/NewUserDialog.vue b/apps/settings/src/components/Users/NewUserDialog.vue
index 6d0c4455dc7..8b345ea748a 100644
--- a/apps/settings/src/components/Users/NewUserDialog.vue
+++ b/apps/settings/src/components/Users/NewUserDialog.vue
@@ -71,8 +71,7 @@
 					:multiple="true"
 					:taggable="true"
 					:required="!settings.isAdmin && !settings.isDelegatedAdmin"
-					:create-option="(value) => ({ name: value })"
-					@input="handleGroupInput"
+					:create-option="(value) => ({ id: value, name: value, isCreating: true })"
 					@search="searchGroups"
 					@option:created="createGroup" />
 					<!-- If user is not admin, he is a subadmin.
@@ -271,15 +270,6 @@ export default {
 			}
 		},
 
-		handleGroupInput(groups) {
-			/**
-			 * Filter out groups with no id to prevent duplicate selected options
-			 *
-			 * Created groups are added programmatically by `createGroup()`
-			 */
-			 this.newUser.groups = groups.filter(group => Boolean(group.id))
-		},
-
 		async searchGroups(query, toggleLoading) {
 			if (this.promise) {
 				this.promise.cancel()
@@ -318,6 +308,21 @@ export default {
 			this.loading.groups = false
 		},
 
+		/**
+		 * Add user to group
+		 *
+		 * @param {object} group Group object
+		 */
+		async addGroup(group) {
+			if (group.isCreating) {
+				return
+			}
+			if (group.canAdd === false) {
+				return
+			}
+			this.newUser.groups.push(group)
+		},
+
 		/**
 		 * Validate quota string to make sure it's a valid human file size
 		 *