diff --git a/client/blocks/login/login-form.jsx b/client/blocks/login/login-form.jsx
index 61638119fe6fc1..90ea6f22c0f466 100644
--- a/client/blocks/login/login-form.jsx
+++ b/client/blocks/login/login-form.jsx
@@ -289,8 +289,6 @@ export class LoginForm extends Component {
 
 		return (
 			<form method="post">
-				{ this.renderPrivateSiteNotice() }
-
 				<Card className="login__form">
 					{ this.renderPrivateSiteNotice() }
 					<div className="login__form-userdata">
diff --git a/client/blocks/signup-form/index.jsx b/client/blocks/signup-form/index.jsx
index f3ec459b8f962c..dd80287465d10c 100644
--- a/client/blocks/signup-form/index.jsx
+++ b/client/blocks/signup-form/index.jsx
@@ -889,7 +889,7 @@ class SignupForm extends Component {
 
 						{ this.props.isSocialSignupEnabled && ! this.userCreationComplete() && (
 							<SocialSignupForm
-								handleResponse={ this.props.handleSocialResponse }
+								handleResponse={ this.handleWooCommerceSocialConnect }
 								socialService={ this.props.socialService }
 								socialServiceResponse={ this.props.socialServiceResponse }
 							/>
diff --git a/client/jetpack-connect/authorize.js b/client/jetpack-connect/authorize.js
index 1c883771106dc9..ddd881c6abab79 100644
--- a/client/jetpack-connect/authorize.js
+++ b/client/jetpack-connect/authorize.js
@@ -259,7 +259,9 @@ export class JetpackAuthorize extends Component {
 		const { alreadyAuthorized, authApproved, from } = this.props.authQuery;
 		return (
 			this.isSso() ||
-			'woocommerce-services-auto-authorize' === from ||
+			( 'woocommerce-services-auto-authorize' === from ||
+				( ! config.isEnabled( 'jetpack/connect/woocommerce' ) &&
+					'woocommerce-setup-wizard' === ' from' ) ) ||
 			( ! this.props.isAlreadyOnSitesList &&
 				! alreadyAuthorized &&
 				( this.props.calypsoStartedConnection || authApproved ) )
diff --git a/client/jetpack-connect/test/__snapshots__/authorize.js.snap b/client/jetpack-connect/test/__snapshots__/authorize.js.snap
index 23686d34205f4b..88b72d91c9a7c9 100644
--- a/client/jetpack-connect/test/__snapshots__/authorize.js.snap
+++ b/client/jetpack-connect/test/__snapshots__/authorize.js.snap
@@ -84,6 +84,7 @@ exports[`JetpackAuthorize renders as expected 1`] = `
         </LoggedOutFormLinkItem>
         <LoggedOutFormLinkItem
           href="/log-in/jetpack?redirect_to=https%3A%2F%2Fexample.com%2F"
+          onClick={[Function]}
         >
           Sign in as a different user
         </LoggedOutFormLinkItem>
diff --git a/client/jetpack-connect/test/authorize.js b/client/jetpack-connect/test/authorize.js
index 90b8d81ace701d..940b10a17819db 100644
--- a/client/jetpack-connect/test/authorize.js
+++ b/client/jetpack-connect/test/authorize.js
@@ -123,12 +123,12 @@ describe( 'JetpackAuthorize', () => {
 	describe( 'isWoo', () => {
 		const isWoo = new JetpackAuthorize().isWoo;
 
-		test( 'should return true for woo wizard', () => {
+		test( 'should return true for woo services', () => {
 			const props = { authQuery: { from: 'woocommerce-services-auto-authorize' } };
 			expect( isWoo( props ) ).toBe( true );
 		} );
 
-		test( 'should return true for woo services', () => {
+		test( 'should return true for woo wizard', () => {
 			const props = { authQuery: { from: 'woocommerce-setup-wizard' } };
 			expect( isWoo( props ) ).toBe( true );
 		} );
@@ -140,9 +140,8 @@ describe( 'JetpackAuthorize', () => {
 	} );
 
 	describe( 'shouldAutoAuthorize', () => {
-		const renderableComponent = <JetpackAuthorize { ...DEFAULT_PROPS } />;
-
 		test( 'should return true for sso', () => {
+			const renderableComponent = <JetpackAuthorize { ...DEFAULT_PROPS } />;
 			const component = shallow( renderableComponent );
 			component.instance().isSso = () => true;
 			const result = component.instance().shouldAutoAuthorize();
@@ -150,9 +149,15 @@ describe( 'JetpackAuthorize', () => {
 			expect( result ).toBe( true );
 		} );
 
-		test( 'should return true for woo', () => {
+		test( 'should return true for woo services', () => {
+			const renderableComponent = <JetpackAuthorize { ...DEFAULT_PROPS } />;
 			const component = shallow( renderableComponent );
-			component.instance().isWoo = () => true;
+			component.setProps( {
+				authQuery: {
+					...DEFAULT_PROPS.authQuery,
+					from: 'woocommerce-services-auto-authorize',
+				},
+			} );
 			const result = component.instance().shouldAutoAuthorize();
 
 			expect( result ).toBe( true );