Merge branch 'master' into PLT-2115

1 files changed, 4 insertions, 3 deletions

diff --git a/web/react/components/team_signup_with_email.jsx b/web/react/components/team_signup_with_email.jsx
index 7dd645b25..a81b22d90 100644
--- a/web/react/components/team_signup_with_email.jsx
+++ b/web/react/components/team_signup_with_email.jsx
@@ -5,6 +5,7 @@ import * as Utils from '../utils/utils.jsx';
 import * as Client from '../utils/client.jsx';
 
 import {injectIntl, intlShape, defineMessages, FormattedMessage} from 'mm-intl';
+import {browserHistory} from 'react-router';
 
 const holders = defineMessages({
     emailError: {
@@ -47,9 +48,9 @@ class EmailSignUpPage extends React.Component {
         Client.signupTeam(team.email,
             (data) => {
                 if (data.follow_link) {
-                    window.location.href = data.follow_link;
+                    browserHistory.push(data.follow_link);
                 } else {
-                    window.location.href = `/signup_team_confirm/?email=${encodeURIComponent(team.email)}`;
+                    browserHistory.push(`/signup_team_confirm/?email=${encodeURIComponent(team.email)}`);
                 }
             },
             (err) => {
@@ -117,4 +118,4 @@ EmailSignUpPage.propTypes = {
     intl: intlShape.isRequired
 };
 
-export default injectIntl(EmailSignUpPage);
\ No newline at end of file
+export default injectIntl(EmailSignUpPage);