diff --git a/_inc/client/components/connect-button/index.jsx b/_inc/client/components/connect-button/index.jsx
index 38e4b18fb3f69..20da9dee83dce 100644
--- a/_inc/client/components/connect-button/index.jsx
+++ b/_inc/client/components/connect-button/index.jsx
@@ -69,6 +69,7 @@ export class ConnectButton extends React.Component {
 					<a
 						role="button"
 						tabIndex="0"
+						className="jp-jetpack-unlink__button"
 						onKeyDown={ onKeyDownCallback( this.props.unlinkUser ) }
 						onClick={ this.props.unlinkUser }
 						disabled={ this.props.isUnlinking } >
@@ -134,12 +135,10 @@ export class ConnectButton extends React.Component {
 	render() {
 		return (
 			<div>
-				{ this.renderContent() }
-				{ this.props.children }
 				{ ! this.props.isSiteConnected &&
 					<p className="jp-banner__tos-blurb">
 					{ __(
-						'By connecting your site you agree to our fascinating {{tosLink}}Terms of Service{{/tosLink}} and to {{shareDetailsLink}}share details{{/shareDetailsLink}} with WordPress.com',
+						'By connecting your site you agree to our {{tosLink}}Terms of Service{{/tosLink}} and to {{shareDetailsLink}}share details{{/shareDetailsLink}} with WordPress.com',
 						{
 							components: {
 								tosLink: <a href="https://wordpress.com/tos" rel="noopener noreferrer" target="_blank" />,
@@ -149,6 +148,8 @@ export class ConnectButton extends React.Component {
 					) }
 					</p>
 				}
+				{ this.renderContent() }
+				{ this.props.children }
 				<JetpackDisconnectDialog
 					show={ this.state.showModal }
 					toggleModal={ this.toggleVisibility }
diff --git a/_inc/client/components/connect-button/style.scss b/_inc/client/components/connect-button/style.scss
index 1167ead343b38..82498acc45281 100644
--- a/_inc/client/components/connect-button/style.scss
+++ b/_inc/client/components/connect-button/style.scss
@@ -14,4 +14,4 @@
 		border-color: $green-dark;
 		color: $white;
 	}
-}
\ No newline at end of file
+}
diff --git a/_inc/client/components/connect-button/test/component.js b/_inc/client/components/connect-button/test/component.js
index e3ce652fb5f1d..34b8e3b2c1b76 100644
--- a/_inc/client/components/connect-button/test/component.js
+++ b/_inc/client/components/connect-button/test/component.js
@@ -64,15 +64,15 @@ describe( 'ConnectButton', () => {
 		const wrapper = shallow( <ConnectButton { ...testProps } /> );
 
 		it( 'does not link to a URL', () => {
-			expect( wrapper.find( 'a' ).first().props().href ).to.not.exist;
+			expect( wrapper.find( 'a.jp-jetpack-unlink__button' ).first().props().href ).to.not.exist;
 		} );
 
 		it( 'has an onClick method', () => {
-			expect( wrapper.find( 'a' ).first().props().onClick ).to.exist;
+			expect( wrapper.find( 'a.jp-jetpack-unlink__button' ).first().props().onClick ).to.exist;
 		} );
 
 		it( 'when clicked, unlinkUser() is called once', () => {
-			wrapper.find( 'a' ).first().simulate( 'click' );
+			wrapper.find( 'a.jp-jetpack-unlink__button' ).first().simulate( 'click' );
 			expect( unlinkUser.calledOnce ).to.be.true;
 		} );
 
diff --git a/_inc/client/components/jetpack-connect/index.jsx b/_inc/client/components/jetpack-connect/index.jsx
index d7689dc73f4c1..1f59cd4c9f699 100644
--- a/_inc/client/components/jetpack-connect/index.jsx
+++ b/_inc/client/components/jetpack-connect/index.jsx
@@ -17,8 +17,6 @@ class JetpackConnect extends React.Component {
 	static displayName = 'JetpackConnect';
 
 	render() {
-		const newAccountUrl = this.props.connectUrl + '&from=new-account-button';
-
 		return (
 			<div className="jp-jetpack-connect__container">
 				<h1 className="jp-jetpack-connect__container-title" title="Welcome to Jetpack">
@@ -29,13 +27,7 @@ class JetpackConnect extends React.Component {
 					<p className="jp-jetpack-connect__description">
 						{ __( 'Hassle-free design, marketing, and security for your WordPress site. Connect Jetpack to a WordPress.com account to start building your own success story.' ) }
 					</p>
-					<ConnectButton from="landing-page-top">
-						<p>
-							<a href={ newAccountUrl } className="jp-jetpack-connect__link">
-								{ __( 'No account? Create one for free.' ) }
-							</a>
-						</p>
-					</ConnectButton>
+					<ConnectButton from="landing-page-top"></ConnectButton>
 				</Card>
 
 				<Card className="jp-jetpack-connect__feature jp-jetpack-connect__design">
@@ -217,13 +209,7 @@ class JetpackConnect extends React.Component {
 							'We\'re passionate about WordPress and here to make your life easier.'
 						) }
 					</p>
-					<ConnectButton from="landing-page-bottom">
-						<p>
-							<a href={ newAccountUrl } className="jp-jetpack-connect__link">
-								{ __( 'No account? Create one for free.' ) }
-							</a>
-						</p>
-					</ConnectButton>
+					<ConnectButton from="landing-page-bottom"></ConnectButton>
 				</Card>
 			</div>
 		);
diff --git a/_inc/client/components/jetpack-connect/style.scss b/_inc/client/components/jetpack-connect/style.scss
index dd44a483ad09d..95a4334de9dc3 100644
--- a/_inc/client/components/jetpack-connect/style.scss
+++ b/_inc/client/components/jetpack-connect/style.scss
@@ -13,8 +13,8 @@
 	.jp-banner__tos-blurb {
 		font-size: rem( 11px );
 		color: $gray-dark;
-		margin-bottom: 0;
 		padding-top: 5px;
+		margin-bottom: 30px;
 	}
 }
 
@@ -24,6 +24,8 @@
 	}
 	.jp-jetpack-connect__description {
 		padding: 0 0 rem( 16px );
+		margin-top: 20px;
+		margin-bottom: 10px;
 	}
 }