diff --git a/changelog/unreleased/enhancement-optimize-email-validation b/changelog/unreleased/enhancement-optimize-email-validation
new file mode 100644
index 00000000000..76c877f491e
--- /dev/null
+++ b/changelog/unreleased/enhancement-optimize-email-validation
@@ -0,0 +1,7 @@
+Enhancement: Optimize email validation in the user management app
+
+We've optimized the email validation process while creating users in the user management app to provide
+a better user experience.
+
+https://github.com/owncloud/web/pull/7894
+https://github.com/owncloud/web/issues/7806
diff --git a/packages/web-app-user-management/src/components/Users/CreateUserModal.vue b/packages/web-app-user-management/src/components/Users/CreateUserModal.vue
index 5706afc8198..aa4bd19e924 100644
--- a/packages/web-app-user-management/src/components/Users/CreateUserModal.vue
+++ b/packages/web-app-user-management/src/components/Users/CreateUserModal.vue
@@ -33,6 +33,7 @@
         :error-message="formData.email.errorMessage"
         type="email"
         :fix-message-line="true"
+        @input="onInputEmail"
         @change="validateEmail"
       />
       <oc-text-input
@@ -100,6 +101,14 @@ export default {
     }
   },
   methods: {
+    onInputEmail() {
+      if (!EmailValidator.validate(this.user.mail)) {
+        return
+      }
+
+      this.formData.email.errorMessage = ''
+      this.formData.email.valid = true
+    },
     validateUserName() {
       this.formData.userName.valid = false