diff --git a/webapp/components/login/login_controller.jsx b/webapp/components/login/login_controller.jsx
index 34fdc536c7..fa3412f340 100644
--- a/webapp/components/login/login_controller.jsx
+++ b/webapp/components/login/login_controller.jsx
@@ -433,6 +433,7 @@ export default class LoginController extends React.Component {
                             defaultMessage="Don't have an account? "
                         />
                         <Link
+                            id='signup'
                             to={'/signup_user_complete' + this.props.location.search}
                             className='signup-team-login'
                         >
diff --git a/webapp/components/select_team/components/select_team_item.jsx b/webapp/components/select_team/components/select_team_item.jsx
index 95325c4f35..202b115287 100644
--- a/webapp/components/select_team/components/select_team_item.jsx
+++ b/webapp/components/select_team/components/select_team_item.jsx
@@ -6,6 +6,7 @@ import React from 'react';
 import {Link} from 'react-router/es6';
 import {Tooltip, OverlayTrigger} from 'react-bootstrap';
 import {Constants} from 'utils/constants.jsx';
+import * as Utils from 'utils/utils.jsx';
 
 export default class SelectTeamItem extends React.Component {
     static propTypes = {
@@ -67,6 +68,7 @@ export default class SelectTeamItem extends React.Component {
             <div className='signup-team-dir'>
                 {showDescriptionTooltip}
                 <Link
+                    id={Utils.createSafeId(this.props.team.display_name)}
                     to={this.props.url}
                     onClick={this.handleTeamClick}
                 >
diff --git a/webapp/components/signup/components/signup_email.jsx b/webapp/components/signup/components/signup_email.jsx
index 976b0648b6..19e2ae6560 100644
--- a/webapp/components/signup/components/signup_email.jsx
+++ b/webapp/components/signup/components/signup_email.jsx
@@ -333,6 +333,7 @@ export default class SignupEmail extends React.Component {
                         </strong></h5>
                         <div className={emailDivStyle}>
                             <input
+                                id='email'
                                 type='email'
                                 ref='email'
                                 className='form-control'
@@ -357,6 +358,7 @@ export default class SignupEmail extends React.Component {
                         </strong></h5>
                         <div className={nameDivStyle}>
                             <input
+                                id='name'
                                 type='text'
                                 ref='name'
                                 className='form-control'
@@ -378,6 +380,7 @@ export default class SignupEmail extends React.Component {
                         </strong></h5>
                         <div className={passwordDivStyle}>
                             <input
+                                id='password'
                                 type='password'
                                 ref='password'
                                 className='form-control'
@@ -390,6 +393,7 @@ export default class SignupEmail extends React.Component {
                     </div>
                     <p className='margin--extra'>
                         <button
+                            id='createAccountButton'
                             type='submit'
                             onClick={this.handleSubmit}
                             className='btn-primary btn'