diff --git a/client/blocks/login/index.jsx b/client/blocks/login/index.jsx
index bcf9b91ce9ff09..72f8fad9d593f0 100644
--- a/client/blocks/login/index.jsx
+++ b/client/blocks/login/index.jsx
@@ -330,7 +330,6 @@ class Login extends Component {
 			isP2Login,
 			isPartnerSignup,
 			isSignupExistingAccount,
-			isSocialFirst,
 			isWhiteLogin,
 			isWoo,
 			isWooCoreProfilerFlow,
@@ -343,14 +342,10 @@ class Login extends Component {
 			wccomFrom,
 		} = this.props;
 
-		let headerText = translate( 'Log in to your account' );
+		let headerText = translate( 'Log in to WordPress.com' );
 		let preHeader = null;
 		let postHeader = null;
 
-		if ( isSocialFirst ) {
-			headerText = translate( 'Log in to WordPress.com' );
-		}
-
 		if ( isManualRenewalImmediateLoginAttempt ) {
 			headerText = translate( 'Log in to update your payment details and renew your subscription' );
 		}
@@ -604,10 +599,10 @@ class Login extends Component {
 		);
 	}
 
-	renderToS() {
-		const { isSocialFirst, translate, twoFactorEnabled } = this.props;
+	renderSubheaderToS() {
+		const { translate, twoFactorEnabled } = this.props;
 
-		if ( ! isSocialFirst || twoFactorEnabled ) {
+		if ( twoFactorEnabled ) {
 			return null;
 		}
 
@@ -820,7 +815,7 @@ class Login extends Component {
 	}
 
 	render() {
-		const { isJetpack, oauth2Client, locale } = this.props;
+		const { isSocialFirst, isJetpack, oauth2Client, locale } = this.props;
 
 		return (
 			<div
@@ -835,7 +830,7 @@ class Login extends Component {
 
 				{ this.renderNotice() }
 
-				{ this.renderToS() }
+				{ isSocialFirst && this.renderSubheaderToS() }
 
 				{ this.renderContent() }
 
diff --git a/client/login/wp-login/index.jsx b/client/login/wp-login/index.jsx
index 9f39c475536eea..be503b0d342e5f 100644
--- a/client/login/wp-login/index.jsx
+++ b/client/login/wp-login/index.jsx
@@ -450,7 +450,7 @@ export class Login extends Component {
 
 		const loginButtons = (
 			<>
-				{ isSocialFirst && isWhiteLogin && (
+				{ isSocialFirst && (
 					<LoginButtons
 						locale={ locale }
 						twoFactorAuthType={ twoFactorAuthType }