3 files changed, 25 insertions, 30 deletions

diff --git a/web/react/components/sidebar_right_menu.jsx b/web/react/components/sidebar_right_menu.jsx
index d221ca840..615bc4ef2 100644
--- a/web/react/components/sidebar_right_menu.jsx
+++ b/web/react/components/sidebar_right_menu.jsx
@@ -15,7 +15,6 @@ module.exports = React.createClass({
         var inviteLink = '';
         var teamSettingsLink = '';
         var manageLink = '';
-        var renameLink = '';
         var currentUser = UserStore.getCurrentUser();
         var isAdmin = false;
 
@@ -48,11 +47,6 @@ module.exports = React.createClass({
                     <a href='#' data-toggle='modal' data-target='#team_members'><i className='glyphicon glyphicon-wrench'></i>Manage Team</a>
                 </li>
             );
-            renameLink = (
-                <li>
-                    <a href='#' data-toggle='modal' data-target='#rename_team_link'><i className='glyphicon glyphicon-pencil'></i>Rename</a>
-                </li>
-            );
         }
 
         var siteName = '';
@@ -77,7 +71,6 @@ module.exports = React.createClass({
                         {inviteLink}
                         {teamLink}
                         {manageLink}
-                        {renameLink}
                         <li><a href='#' onClick={this.handleLogoutClick}><i className='glyphicon glyphicon-log-out'></i>Logout</a></li>
                         <li className='divider'></li>
                         <li><a target='_blank' href='/static/help/configure_links.html'><i className='glyphicon glyphicon-question-sign'></i>Help</a></li>
diff --git a/web/react/components/team_import_tab.jsx b/web/react/components/team_import_tab.jsx
index ecb3491b0..e3415d7f4 100644
--- a/web/react/components/team_import_tab.jsx
+++ b/web/react/components/team_import_tab.jsx
@@ -23,12 +23,10 @@ module.exports = React.createClass({
         var uploadHelpText = (
             <div>
                 <br/>
-                Slack does now allow you to export any of your files or images stored in slack. Private channels and direct message channels are also not exported. Therefore, no files, images, or private channels will be imported. 
-                <br/>
-                Slack bot posts are not imported.
-                <br/>
-                Unable to import Slack channels that are not valid Mattermost channels. (ex underscores)
-                <br/>
+                Slack does not allow you to export files, images, private groups or direct messages stored in Slack. Therefore, Slack import to Mattermost only supports importing of text messages in your Slack team's public channels. 
+                <br/><br/>
+                The Slack import to Mattermost is in "Preview". Slack bot posts and channels with underscores do not yet import.
+                <br/><br/>
             </div>
         );
         var uploadSection = (
diff --git a/web/react/components/team_signup_password_page.jsx b/web/react/components/team_signup_password_page.jsx
index e4f35f100..bbe82a5c2 100644
--- a/web/react/components/team_signup_password_page.jsx
+++ b/web/react/components/team_signup_password_page.jsx
@@ -31,31 +31,35 @@ module.exports = React.createClass({
         teamSignup.user.allow_marketing = true;
         delete teamSignup.wizard;
 
-        // var ctl = this;
-
         client.createTeamFromSignup(teamSignup,
             function success() {
                 client.track('signup', 'signup_team_08_complete');
 
                 var props = this.props;
 
-                $('#sign-up-button').button('reset');
-                props.state.wizard = 'finished';
-                props.updateParent(props.state, true);
+                
+                client.loginByEmail(teamSignup.team.name, teamSignup.team.email, teamSignup.user.password,
+                    function(data) {
+                        UserStore.setLastEmail(teamSignup.team.email);
+                        UserStore.setCurrentUser(teamSignup.user);
+                        if (this.props.hash > 0) {
+                            BrowserStore.setGlobalItem(this.props.hash, JSON.stringify({wizard: 'finished'}));
+                        }
 
-                window.location.href = utils.getWindowLocationOrigin() + '/' + props.state.team.name + '/login?email=' + encodeURIComponent(teamSignup.team.email);
+                        $('#sign-up-button').button('reset');
+                        props.state.wizard = 'finished';
+                        props.updateParent(props.state, true);
 
-                // client.loginByEmail(teamSignup.team.domain, teamSignup.team.email, teamSignup.user.password,
-                //     function(data) {
-                //         TeamStore.setLastName(teamSignup.team.domain);
-                //         UserStore.setLastEmail(teamSignup.team.email);
-                //         UserStore.setCurrentUser(data);
-                //         window.location.href = '/channels/town-square';
-                //     }.bind(ctl),
-                //     function(err) {
-                //         this.setState({nameError: err.message});
-                //     }.bind(ctl)
-                // );
+                        window.location.href = '/';
+                    }.bind(this),
+                    function(err) {
+                        if (err.message === 'Login failed because email address has not been verified') {
+                            window.location.href = '/verify_email?email=' + encodeURIComponent(teamSignup.team.email) + '&teamname=' + encodeURIComponent(teamSignup.team.name);
+                        } else {
+                            this.setState({serverError: err.message});
+                        }
+                    }.bind(this)
+                );
             }.bind(this),
             function error(err) {
                 this.setState({serverError: err.message});