diff --git a/web/react/components/claim/claim_account.jsx b/web/react/components/claim/claim_account.jsx
index 87026b7627..5b3b584eed 100644
--- a/web/react/components/claim/claim_account.jsx
+++ b/web/react/components/claim/claim_account.jsx
@@ -43,11 +43,7 @@ export default class ClaimAccount extends React.Component {
             );
         }
 
-        return (
-            <div>
-                {content}
-            </div>
-        );
+        return content;
     }
 }
 
diff --git a/web/react/components/claim/email_to_sso.jsx b/web/react/components/claim/email_to_sso.jsx
index 3d4b9e91fc..87e86697cf 100644
--- a/web/react/components/claim/email_to_sso.jsx
+++ b/web/react/components/claim/email_to_sso.jsx
@@ -70,62 +70,69 @@ class EmailToSSO extends React.Component {
         const uiType = Utils.toTitleCase(this.props.type) + ' SSO';
 
         return (
-            <div className='col-sm-12'>
-                <div className='signup-team__container'>
-                    <h3>
+            <div>
+                <h3>
+                    <FormattedMessage
+                        id='claim.email_to_sso.title'
+                        defaultMessage='Switch Email/Password Account to {uiType}'
+                        values={{
+                            uiType: uiType
+                        }}
+                    />
+                </h3>
+                <form onSubmit={this.submit}>
+                    <p>
                         <FormattedMessage
-                            id='claim.email_to_sso.title'
-                            defaultMessage='Switch Email/Password Account to {uiType}'
+                            id='claim.email_to_sso.ssoType'
+                            defaultMessage='Upon claiming your account, you will only be able to login with {type} SSO. You must already have a valid {type} account'
+                            values={{
+                                type: Utils.toTitleCase(this.props.type)
+                            }}
+                        />
+                    </p>
+                    <p>
+                        <FormattedMessage
+                            id='claim.email_to_sso.ssoNote'
+                            defaultMessage='You must already have a valid {type} account'
+                            values={{
+                                type: Utils.toTitleCase(this.props.type)
+                            }}
+                        />
+                    </p>
+                    <p>
+                        <FormattedMessage
+                            id='claim.email_to_sso.enterPwd'
+                            defaultMessage='Enter the password for your {team} {site} account'
+                            values={{
+                                team: this.props.teamDisplayName,
+                                site: global.window.mm_config.SiteName
+                            }}
+                        />
+                    </p>
+                    <div className={formClass}>
+                        <input
+                            type='password'
+                            className='form-control'
+                            name='password'
+                            ref='password'
+                            placeholder={this.props.intl.formatMessage(holders.pwd)}
+                            spellCheck='false'
+                        />
+                    </div>
+                    {error}
+                    <button
+                        type='submit'
+                        className='btn btn-primary'
+                    >
+                        <FormattedMessage
+                            id='claim.email_to_sso.switchTo'
+                            defaultMessage='Switch account to {uiType}'
                             values={{
                                 uiType: uiType
                             }}
                         />
-                    </h3>
-                    <form onSubmit={this.submit}>
-                        <p>
-                            <FormattedMessage
-                                id='claim.email_to_sso.ssoType'
-                                defaultMessage='Upon claiming your account, you will only be able to login with {type} SSO'
-                                values={{
-                                    type: Utils.toTitleCase(this.props.type)
-                                }}
-                            />
-                        </p>
-                        <p>
-                            <FormattedMessage
-                                id='claim.email_to_sso.enterPwd'
-                                defaultMessage='Enter the password for your {team} {site} account'
-                                values={{
-                                    team: this.props.teamDisplayName,
-                                    site: global.window.mm_config.SiteName
-                                }}
-                            />
-                        </p>
-                        <div className={formClass}>
-                            <input
-                                type='password'
-                                className='form-control'
-                                name='password'
-                                ref='password'
-                                placeholder={this.props.intl.formatMessage(holders.pwd)}
-                                spellCheck='false'
-                            />
-                        </div>
-                        {error}
-                        <button
-                            type='submit'
-                            className='btn btn-primary'
-                        >
-                            <FormattedMessage
-                                id='claim.email_to_sso.switchTo'
-                                defaultMessage='Switch account to {uiType}'
-                                values={{
-                                    uiType: uiType
-                                }}
-                            />
-                        </button>
-                    </form>
-                </div>
+                    </button>
+                </form>
             </div>
         );
     }
@@ -141,4 +148,4 @@ EmailToSSO.propTypes = {
     teamDisplayName: React.PropTypes.string.isRequired
 };
 
-export default injectIntl(EmailToSSO);
\ No newline at end of file
+export default injectIntl(EmailToSSO);
diff --git a/web/react/components/claim/sso_to_email.jsx b/web/react/components/claim/sso_to_email.jsx
index 73ff13cc94..74137082a9 100644
--- a/web/react/components/claim/sso_to_email.jsx
+++ b/web/react/components/claim/sso_to_email.jsx
@@ -86,69 +86,67 @@ class SSOToEmail extends React.Component {
         const uiType = Utils.toTitleCase(this.props.currentType) + ' SSO';
 
         return (
-            <div className='col-sm-12'>
-                <div className='signup-team__container'>
-                    <h3>
+            <div>
+                <h3>
+                    <FormattedMessage
+                        id='claim.sso_to_email.title'
+                        defaultMessage='Switch {type} Account to Email'
+                        values={{
+                            type: uiType
+                        }}
+                    />
+                </h3>
+                <form onSubmit={this.submit}>
+                    <p>
                         <FormattedMessage
-                            id='claim.sso_to_email.title'
-                            defaultMessage='Switch {type} Account to Email'
+                            id='claim.sso_to_email.description'
+                            defaultMessage='Upon changing your account type, you will only be able to login with your email and password.'
+                        />
+                    </p>
+                    <p>
+                        <FormattedMessage
+                            id='claim.sso_to_email_newPwd'
+                            defaultMessage='Enter a new password for your {team} {site} account'
+                            values={{
+                                team: this.props.teamDisplayName,
+                                site: global.window.mm_config.SiteName
+                            }}
+                        />
+                    </p>
+                    <div className={formClass}>
+                        <input
+                            type='password'
+                            className='form-control'
+                            name='password'
+                            ref='password'
+                            placeholder={formatMessage(holders.newPwd)}
+                            spellCheck='false'
+                        />
+                    </div>
+                    <div className={formClass}>
+                        <input
+                            type='password'
+                            className='form-control'
+                            name='passwordconfirm'
+                            ref='passwordconfirm'
+                            placeholder={formatMessage(holders.confirm)}
+                            spellCheck='false'
+                        />
+                    </div>
+                    {error}
+                    <button
+                        type='submit'
+                        className='btn btn-primary'
+                    >
+                        <FormattedMessage
+                            id='claim.sso_to_email.switchTo'
+                            defaultMessage='Switch {type} to email and password'
                             values={{
                                 type: uiType
                             }}
                         />
-                    </h3>
-                    <form onSubmit={this.submit}>
-                        <p>
-                            <FormattedMessage
-                                id='claim.sso_to_email.description'
-                                defaultMessage='Upon changing your account type, you will only be able to login with your email and password.'
-                            />
-                        </p>
-                        <p>
-                            <FormattedMessage
-                                id='claim.sso_to_email_newPwd'
-                                defaultMessage='Enter a new password for your {team} {site} account'
-                                values={{
-                                    team: this.props.teamDisplayName,
-                                    site: global.window.mm_config.SiteName
-                                }}
-                            />
-                        </p>
-                        <div className={formClass}>
-                            <input
-                                type='password'
-                                className='form-control'
-                                name='password'
-                                ref='password'
-                                placeholder={formatMessage(holders.newPwd)}
-                                spellCheck='false'
-                            />
-                        </div>
-                        <div className={formClass}>
-                            <input
-                                type='password'
-                                className='form-control'
-                                name='passwordconfirm'
-                                ref='passwordconfirm'
-                                placeholder={formatMessage(holders.confirm)}
-                                spellCheck='false'
-                            />
-                        </div>
-                        {error}
-                        <button
-                            type='submit'
-                            className='btn btn-primary'
-                        >
-                            <FormattedMessage
-                                id='claim.sso_to_email.switchTo'
-                                defaultMessage='Switch {type} to email and password'
-                                values={{
-                                    type: uiType
-                                }}
-                            />
-                        </button>
-                    </form>
-                </div>
+                    </button>
+                </form>
             </div>
         );
     }
@@ -164,4 +162,4 @@ SSOToEmail.propTypes = {
     teamDisplayName: React.PropTypes.string.isRequired
 };
 
-export default injectIntl(SSOToEmail);
\ No newline at end of file
+export default injectIntl(SSOToEmail);
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index 984f16f29d..d980885a38 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -548,6 +548,7 @@
   "claim.email_to_sso.pwd": "Password",
   "claim.email_to_sso.title": "Switch Email/Password Account to {uiType}",
   "claim.email_to_sso.ssoType": "Upon claiming your account, you will only be able to login with {type} SSO",
+  "claim.email_to_sso.ssoNote": "You must already have a valid {type} account",
   "claim.email_to_sso.enterPwd": "Enter the password for your {team} {site} account",
   "claim.email_to_sso.switchTo": "Switch account to {uiType}",
   "claim.sso_to_email.enterPwd": "Please enter a password.",
@@ -1269,4 +1270,4 @@
   "intro_messages.beginning": "Beginning of {name}",
   "intro_messages.invite": "Invite others to this {type}",
   "intro_messages.setHeader": "Set a Header"
-}
\ No newline at end of file
+}