diff --git a/frontend/src/components/dialog/manage-members-dialog.js b/frontend/src/components/dialog/manage-members-dialog.js
index 54cf991617..bebe4b0557 100644
--- a/frontend/src/components/dialog/manage-members-dialog.js
+++ b/frontend/src/components/dialog/manage-members-dialog.js
@@ -5,6 +5,7 @@ import { gettext } from '../../utils/constants';
 import { Button, Modal, ModalHeader, ModalBody, ModalFooter, Table } from 'reactstrap';
 import { seafileAPI } from '../../utils/seafile-api.js';
 import PermissionEditor from '../permission-editor';
+import UserSelect from '../../models/user-select';
 import '../../css/manage-members-dialog.css';
 
 const propTypes = {
@@ -21,56 +22,36 @@ class ManageMembersDialog extends React.Component {
     this.state = {
       groupMembers: [],
       selectedOption: null,
-      errMessage: '',
+      errMessage: [],
+      clearSelect: false,
     };
-    this.options = [];
   }
 
-  handleSelectChange = (option) => {
+  onSelectChange = (option) => {
     this.setState({
       selectedOption: option,
-      errMessage: '',
+      errMessage: [],
+      clearSelect: false,
     });
-    this.options = [];
-  }
-
-  loadOptions = (value, callback) => {
-    if (value.trim().length > 0) {
-      seafileAPI.searchUsers(value.trim()).then((res) => {
-        this.options = [];
-        for (let i = 0 ; i < res.data.users.length; i++) {
-          let obj = {};
-          obj.value = res.data.users[i].name;
-          obj.email = res.data.users[i].email;
-          obj.label =
-            <React.Fragment>
-              <img src={res.data.users[i].avatar_url} className="avatar" alt=""/>
-              <span className="transfer-group-name">{res.data.users[i].name}</span>
-            </React.Fragment>;
-          this.options.push(obj);
-        }
-        callback(this.options);
-      });
-    }
   }
 
   addGroupMember = () => {
-    if (this.state.selectedOption && this.state.selectedOption.email) {
-      this.refs.memberSelect.select.onChange([], { action: 'clear' });
-      seafileAPI.addGroupMember(this.props.groupID, this.state.selectedOption.email).then((res) => {
-        this.onGroupMembersChange();
-        this.options = [];
-        this.setState({
-          selectedOption: null,
-        });
-      }).catch((error) => {
-        if (error.response) {
-          this.setState({
-            errMessage: error.response.data.error_msg
-          });
-        }
-      });
+    let emails = [];
+    for (let i = 0; i < this.state.selectedOption.length; i++) {
+      emails.push(this.state.selectedOption[i].email);
     }
+    seafileAPI.addGroupMembers(this.props.groupID, emails).then((res) => {
+      this.onGroupMembersChange();
+      this.setState({
+        selectedOption: null,
+        clearSelect: true,
+      });
+      if (res.data.failed.length > 0) {
+        this.setState({
+          errMessage: res.data.failed
+        });
+      }
+    });
   }
 
   listGroupMembers = () => {
@@ -100,17 +81,26 @@ class ManageMembersDialog extends React.Component {
         <ModalBody>
           <p>{gettext('Add group member')}</p>
           <div className='group-transfer'>
-            <AsyncSelect
-              className='group-transfer-select'
-              isClearable classNamePrefix
-              loadOptions={this.loadOptions}
-              onChange={this.handleSelectChange}
-              placeholder={gettext('Search users...')}
-              ref="memberSelect"
+            <UserSelect
+              placeholder='Search users...'
+              onSelectChange={this.onSelectChange}
+              clearSelect={this.state.clearSelect}
+              isMulti={true}
+              className="group-transfer-select"
             />
-            <Button color="secondary" onClick={this.addGroupMember}>{gettext('Submit')}</Button>
+            {this.state.selectedOption ?
+              <Button color="secondary" onClick={this.addGroupMember}>{gettext('Submit')}</Button> :
+              <Button color="secondary" disabled>{gettext('Submit')}</Button>
+            }
           </div>
-          <span className="error">{this.state.errMessage}</span>
+          {
+            this.state.errMessage.length > 0 &&
+            this.state.errMessage.map((item, index = 0) => {
+              return (
+                <div className="group-error error" key={index}>{item.error_msg}</div>
+              );
+            })
+          }
           <div className="manage-members">
             <Table hover size="sm" className="manage-members-table">
               <thead>
diff --git a/frontend/src/css/manage-members-dialog.css b/frontend/src/css/manage-members-dialog.css
index 0cf2193a9f..0b0daca86a 100644
--- a/frontend/src/css/manage-members-dialog.css
+++ b/frontend/src/css/manage-members-dialog.css
@@ -41,4 +41,7 @@
 }
 .group-transfer .btn {
   width: 75px;
+}
+.group-error {
+  margin-top: 10px;
 }
\ No newline at end of file
diff --git a/frontend/src/models/user-select.js b/frontend/src/models/user-select.js
new file mode 100644
index 0000000000..fd5570fc29
--- /dev/null
+++ b/frontend/src/models/user-select.js
@@ -0,0 +1,73 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import AsyncSelect from 'react-select/lib/Async';
+import { seafileAPI } from '../utils/seafile-api.js';
+import { gettext } from '../utils/constants';
+
+const propTypes = {
+  placeholder: PropTypes.string.isRequired,
+  onSelectChange: PropTypes.func.isRequired,
+  clearSelect: PropTypes.bool.isRequired,
+  isMulti: PropTypes.bool.isRequired,
+  className: PropTypes.string.isRequired,
+};
+
+class UserSelect extends React.Component {
+
+  constructor(props) {
+    super(props);
+    this.options = [];
+  }
+
+  handleSelectChange = (option) => {
+    this.options = [];
+    this.props.onSelectChange(option);
+  }
+
+  loadOptions = (input, callback) => {
+    const value = input.trim();
+    if (value.length > 0) {
+      seafileAPI.searchUsers(value).then((res) => {
+        this.options = [];
+        for (let i = 0 ; i < res.data.users.length; i++) {
+          const item = res.data.users[i];
+          let obj = {};
+          obj.value = item.name;
+          obj.email = item.email;
+          obj.label =
+            <React.Fragment>
+              <img src={item.avatar_url} className="select-module select-module-icon avatar" alt=""/>
+              <span className='select-module select-module-name'>{item.name}</span>
+            </React.Fragment>;
+          this.options.push(obj);
+        }
+        callback(this.options);
+      });
+    }
+  }
+
+  componentWillReceiveProps(nextProps) {
+    if (nextProps.clearSelect === true && this.props.clearSelect === false) {
+      this.refs.userSelect.select.onChange([], { action: 'clear' });
+    }
+  }
+
+  render() {
+    return (
+      <AsyncSelect
+        isClearable
+        classNamePrefix
+        isMulti={this.props.isMulti}
+        loadOptions={this.loadOptions}
+        onChange={this.handleSelectChange}
+        placeholder={gettext(this.props.placeholder)}
+        className={this.props.className}
+        ref="userSelect"
+      />
+    );
+  }
+}
+
+UserSelect.propTypes = propTypes;
+
+export default UserSelect;
\ No newline at end of file