diff --git a/webapp/components/signup_team.jsx b/webapp/components/signup_team.jsx
index e6b27e7455..a745dbc562 100644
--- a/webapp/components/signup_team.jsx
+++ b/webapp/components/signup_team.jsx
@@ -52,6 +52,7 @@ export default class TeamSignUp extends React.Component {
 
     updatePage(page) {
         this.setState({page});
+
     }
 
     componentWillMount() {
@@ -138,6 +139,24 @@ export default class TeamSignUp extends React.Component {
         }
 
         let signupMethod = null;
+        let goBack = (
+            <div className='signup-header'>
+                <a
+                    href='/'
+                    onClick={
+                        (e) => {
+                            e.preventDefault();
+                            this.updatePage('choose');
+                        }
+                    }
+                >
+                    <span className='fa fa-chevron-left'/>
+                    <FormattedMessage
+                        id='web.header.back'
+                    />
+                </a>
+            </div>
+        );
 
         if (global.window.mm_config.EnableTeamCreation !== 'true') {
             if (teamListing == null) {
@@ -154,9 +173,12 @@ export default class TeamSignUp extends React.Component {
                     updatePage={this.updatePage}
                 />
             );
+            goBack = null;
         } else if (this.state.page === 'email') {
             signupMethod = (
-                <EmailSignUpPage/>
+                <div>
+                    <EmailSignUpPage/>
+                </div>
             );
         } else if (this.state.page === 'ldap') {
             return (
@@ -180,24 +202,28 @@ export default class TeamSignUp extends React.Component {
                     defaultMessage='No team creation method has been enabled.  Please contact an administrator for access.'
                 />
             );
+            goBack = null;
         }
 
         return (
-            <div className='col-sm-12'>
-                <div className='signup-team__container'>
-                    <img
-                        className='signup-team-logo'
-                        src={logoImage}
-                    />
-                    <h1>{global.window.mm_config.SiteName}</h1>
-                    <h4 className='color--light'>
-                        <FormattedMessage
-                            id='web.root.singup_info'
+            <div>
+                {goBack}
+                <div className='col-sm-12'>
+                    <div className='signup-team__container'>
+                        <img
+                            className='signup-team-logo'
+                            src={logoImage}
                         />
-                    </h4>
-                    <div id='signup-team'>
-                        {teamListing}
-                        {signupMethod}
+                        <h1>{global.window.mm_config.SiteName}</h1>
+                        <h4 className='color--light'>
+                            <FormattedMessage
+                                id='web.root.singup_info'
+                            />
+                        </h4>
+                        <div id='signup-team'>
+                            {teamListing}
+                            {signupMethod}
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/webapp/sass/routes/_signup.scss b/webapp/sass/routes/_signup.scss
index 61bb93daf2..062e4c9a53 100644
--- a/webapp/sass/routes/_signup.scss
+++ b/webapp/sass/routes/_signup.scss
@@ -200,7 +200,7 @@
             display: block;
             height: 40px;
             line-height: 34px;
-            margin: 1em 0;
+            margin: 1em 0 1em 10px;
             min-width: 200px;
             padding: 0 1em;
             width: 200px;
@@ -262,9 +262,10 @@
             }
 
             &.btn-full {
-                width: 100%;
-                text-align: left;
+                margin-left: 0;
                 padding-left: 35px;
+                text-align: left;
+                width: 100%;
             }
         }