diff --git a/webapp/components/add_users_to_team.jsx b/webapp/components/add_users_to_team.jsx
index c03d9ccd9d..f0936c0d76 100644
--- a/webapp/components/add_users_to_team.jsx
+++ b/webapp/components/add_users_to_team.jsx
@@ -223,6 +223,13 @@ export default class AddUsersToTeam extends React.Component {
             />
         );
 
+        const buttonSubmitText = (
+            <FormattedMessage
+                id='multiselect.add'
+                defaultMessage='Add'
+            />
+        );
+
         return (
             <Modal
                 dialogClassName={'more-modal more-direct-channels'}
@@ -258,6 +265,7 @@ export default class AddUsersToTeam extends React.Component {
                         handleSubmit={this.handleSubmit}
                         maxValues={MAX_SELECTABLE_VALUES}
                         numRemainingText={numRemainingText}
+                        buttonSubmitText={buttonSubmitText}
                     />
                 </Modal.Body>
             </Modal>
diff --git a/webapp/components/more_direct_channels.jsx b/webapp/components/more_direct_channels.jsx
index 0fbd9053f7..c8a0d22ee7 100644
--- a/webapp/components/more_direct_channels.jsx
+++ b/webapp/components/more_direct_channels.jsx
@@ -279,6 +279,13 @@ export default class MoreDirectChannels extends React.Component {
             }
         }
 
+        const buttonSubmitText = (
+            <FormattedMessage
+                id='multiselect.go'
+                defaultMessage='Go'
+            />
+        );
+
         const numRemainingText = (
             <FormattedMessage
                 id='multiselect.numPeopleRemaining'
@@ -320,6 +327,7 @@ export default class MoreDirectChannels extends React.Component {
                         noteText={note}
                         maxValues={MAX_SELECTABLE_VALUES}
                         numRemainingText={numRemainingText}
+                        buttonSubmitText={buttonSubmitText}
                     />
                 </Modal.Body>
             </Modal>
diff --git a/webapp/components/multiselect/multiselect.jsx b/webapp/components/multiselect/multiselect.jsx
index bba739ae5b..c2bf60172e 100644
--- a/webapp/components/multiselect/multiselect.jsx
+++ b/webapp/components/multiselect/multiselect.jsx
@@ -129,6 +129,18 @@ export default class MultiSelect extends React.Component {
             );
         }
 
+        let buttonSubmitText;
+        if (this.props.buttonSubmitText) {
+            buttonSubmitText = this.props.buttonSubmitText;
+        } else if (this.props.maxValues != null) {
+            buttonSubmitText = (
+                <FormattedMessage
+                    id='multiselect.go'
+                    defaultMessage='Go'
+                />
+            );
+        }
+
         let optionsToDisplay = [];
         let nextButton;
         let previousButton;
@@ -216,10 +228,7 @@ export default class MultiSelect extends React.Component {
                             className='btn btn-primary btn-sm'
                             onClick={this.props.handleSubmit}
                         >
-                            <FormattedMessage
-                                id='multiselect.go'
-                                defaultMessage='Go'
-                            />
+                            {buttonSubmitText}
                         </button>
                     </div>
                     <div className='multi-select__help'>
@@ -265,5 +274,6 @@ MultiSelect.propTypes = {
     handleSubmit: React.PropTypes.func,
     noteText: React.PropTypes.node,
     maxValues: React.PropTypes.number,
-    numRemainingText: React.PropTypes.node
+    numRemainingText: React.PropTypes.node,
+    buttonSubmitText: React.PropTypes.node
 };
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 791e994f65..8086bcfeff 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1742,6 +1742,7 @@
   "msg_typing.isTyping": "{user} is typing...",
   "msg_typing.someone": "Someone",
   "multiselect.go": "Go",
+  "multiselect.add": "Add",
   "multiselect.instructions": "Use up/down arrows to navigate and enter to select",
   "multiselect.numPeopleRemaining": "You can add {num, number} more {num, plural, =0 {people} one {person} other {people}}. ",
   "multiselect.numRemaining": "You can add {num, number} more",