p-jackson

diff --git a/client/landing/gutenboarding/onboarding-block/style-preview/font-select.tsx b/client/landing/gutenboarding/onboarding-block/style-preview/font-select.tsx
index 090a9eab53..8284ad01c6 100644
--- a/client/landing/gutenboarding/onboarding-block/style-preview/font-select.tsx
+++ b/client/landing/gutenboarding/onboarding-block/style-preview/font-select.tsx
@@ -141,9 +141,13 @@ const FontSelect: React.FunctionComponent = () => {
 
 							return (
 								<Button
-									className={ classnames( 'style-preview__font-option', {
-										'is-selected': isSelected,

p-jackson

diff --git a/client/lib/signup/step-actions/index.js b/client/lib/signup/step-actions/index.js
index 92f0017eed..62c0680aec 100644
--- a/client/lib/signup/step-actions/index.js
+++ b/client/lib/signup/step-actions/index.js
@@ -153,7 +153,7 @@ function getNewSiteParams( {
 	const siteSegment = getSiteTypePropertyValue( 'slug', siteType, 'id' );
 	const siteTypeTheme = getSiteTypePropertyValue( 'slug', siteType, 'theme' );
 	const selectedDesign = get( signupDependencies, 'selectedDesign', false );
-	const userId = getCurrentUserId( state );
+	const userId = signupDependencies.user_id || getCurrentUserId( state );