1 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/invite_members/components/members_token_select.vue b/app/assets/javascripts/invite_members/components/members_token_select.vue
index e0bfa1111e8..8493787f075 100644
--- a/app/assets/javascripts/invite_members/components/members_token_select.vue
+++ b/app/assets/javascripts/invite_members/components/members_token_select.vue
@@ -59,6 +59,7 @@ export default {
     return {
       loading: false,
       query: '',
+      originalInput: '',
       users: [],
       selectedTokens: [],
       hasBeenFocused: false,
@@ -67,9 +68,9 @@ export default {
   },
   computed: {
     emailIsValid() {
-      const regex = /.+@/;
+      const regex = /^\S+@\S+$/;
 
-      return this.query.match(regex) !== null;
+      return this.originalInput.match(regex) !== null;
     },
     placeholderText() {
       if (this.selectedTokens.length === 0) {
@@ -116,6 +117,7 @@ export default {
   methods: {
     handleTextInput(inputQuery) {
       this.hideDropdownWithNoItems = false;
+      this.originalInput = inputQuery;
       this.query = inputQuery.trim();
       this.loading = true;
       this.retrieveUsers();