diff --git a/assets/css/admin.css b/assets/css/admin.css
index 164d4e5b6..30fab533c 100644
--- a/assets/css/admin.css
+++ b/assets/css/admin.css
@@ -424,7 +424,7 @@ button.prpl-info-icon {
 
 	label {
 		display: grid;
-		grid-template-columns: 1fr 3fr;
+		grid-template-columns: 2fr 8fr;
 		margin-bottom: 0.5em;
 		gap: var(--prpl-padding);
 	}
@@ -467,9 +467,15 @@ button.prpl-info-icon {
 	margin-inline-start: 0.25em;
 	vertical-align: middle;
 
-	svg {
-		width: 1em;
-		height: 1em;
+	label {
+		display: grid;
+		grid-template-columns: 2fr 8fr;
+		margin-bottom: 0.5em;
+		gap: var(--prpl-padding);
+	}
+
+	.prpl-onboard-form-radio-select {
+		margin-bottom: 1em;
 	}
 }
 
diff --git a/assets/js/onboard.js b/assets/js/onboard.js
index 1d3306606..18c4121d5 100644
--- a/assets/js/onboard.js
+++ b/assets/js/onboard.js
@@ -103,6 +103,22 @@ if ( document.getElementById( 'prpl-onboarding-form' ) ) {
 						.forEach( ( inputField ) => {
 							inputField.required = false;
 						} );
+
+					// Hide the form fields and the primary button.
+					document
+						.getElementById( 'prpl-onboarding-form' )
+						.querySelectorAll(
+							'.prpl-form-fields, .prpl-button-primary'
+						)
+						.forEach( ( el ) => el.classList.add( 'prpl-hidden' ) );
+
+					// Show the secondary button.
+					document
+						.getElementById( 'prpl-onboarding-form' )
+						.querySelectorAll( '.prpl-button-secondary--no-email' )
+						.forEach( ( el ) =>
+							el.classList.remove( 'prpl-hidden' )
+						);
 				} else {
 					document
 						.getElementById( 'prpl-onboarding-form' )
@@ -115,13 +131,23 @@ if ( document.getElementById( 'prpl-onboarding-form' ) ) {
 								inputField.required = true;
 							}
 						} );
+
+					// Show the form fields and the primary button.
+					document
+						.getElementById( 'prpl-onboarding-form' )
+						.querySelectorAll(
+							'.prpl-form-fields, .prpl-button-primary'
+						)
+						.forEach( ( el ) =>
+							el.classList.remove( 'prpl-hidden' )
+						);
+
+					// Hide the secondary button.
+					document
+						.getElementById( 'prpl-onboarding-form' )
+						.querySelectorAll( '.prpl-button-secondary--no-email' )
+						.forEach( ( el ) => el.classList.add( 'prpl-hidden' ) );
 				}
-				document
-					.getElementById( 'prpl-onboarding-form' )
-					.querySelectorAll(
-						'.prpl-form-fields, .prpl-form-fields, .prpl-button-primary, .prpl-button-secondary--no-email'
-					)
-					.forEach( ( el ) => el.classList.toggle( 'prpl-hidden' ) );
 			} );
 		} );
 
diff --git a/views/popovers/subscribe-form.php b/views/popovers/subscribe-form.php
index 1cd1228f2..90266d031 100644
--- a/views/popovers/subscribe-form.php
+++ b/views/popovers/subscribe-form.php
@@ -26,45 +26,68 @@
 	?>
 	</p>
 	<div class="prpl-form-fields">
-		<label>
-			<span class="prpl-label-content">
-				<?php \esc_html_e( 'First name', 'progress-planner' ); ?>
-			</span>
+		<div class="prpl-onboard-form-radio-select">
+			<label>
+				<input type="radio" name="with-email" value="weekly" checked>
+				<span class="prpl-label-content">
+					<?php \esc_html_e( 'Yes, send me weekly updates!', 'progress-planner' ); ?>
+				</span>
+			</label>
+			<label>
+				<input type="radio" name="with-email" value="monthly">
+				<span class="prpl-label-content">
+					<?php \esc_html_e( 'Monthly, tell me what to do next month!', 'progress-planner' ); ?>
+				</span>
+			</label>
+			<label>
+				<input type="radio" name="with-email" value="quarterly">
+				<span class="prpl-label-content">
+					<?php \esc_html_e( 'Quarterly, just keep me posted on your plugin updates.', 'progress-planner' ); ?>
+				</span>
+			</label>
+			<label>
+				<input type="radio" name="with-email" value="no">
+				<span class="prpl-label-content">
+					<?php \esc_html_e( 'No, I don’t want emails right now.', 'progress-planner' ); ?>
+				</span>
+			</label>
+		</div>
+		<div class="prpl-form-fields">
+			<label>
+				<span class="prpl-label-content">
+					<?php \esc_html_e( 'First name', 'progress-planner' ); ?>
+				</span>
+				<input
+					type="text"
+					name="name"
+					class="prpl-input"
+					required
+					value="<?php echo \esc_attr( \get_user_meta( $prpl_current_user->ID, 'first_name', true ) ); ?>"
+				>
+			</label>
+			<label>
+				<span class="prpl-label-content">
+					<?php \esc_html_e( 'Email', 'progress-planner' ); ?>
+				</span>
+				<input
+					type="email"
+					name="email"
+					class="prpl-input"
+					required
+					value="<?php echo \esc_attr( $prpl_current_user->user_email ); ?>"
+				>
+			</label>
 			<input
-				type="text"
-				name="name"
-				class="prpl-input"
-				required
-				value="<?php echo \esc_attr( \get_user_meta( $prpl_current_user->ID, 'first_name', true ) ); ?>"
+				type="hidden"
+				name="site"
+				value="<?php echo \esc_attr( \set_url_scheme( \site_url() ) ); ?>"
 			>
-		</label>
-		<label>
-			<span class="prpl-label-content">
-				<?php \esc_html_e( 'Email', 'progress-planner' ); ?>
-			</span>
 			<input
-				type="email"
-				name="email"
-				class="prpl-input"
-				required
-				value="<?php echo \esc_attr( $prpl_current_user->user_email ); ?>"
+				type="hidden"
+				name="timezone_offset"
+				value="<?php echo (float) ( \wp_timezone()->getOffset( new \DateTime( 'midnight' ) ) / 3600 ); ?>"
 			>
-		</label>
-		<input
-			type="hidden"
-			name="site"
-			value="<?php echo \esc_attr( \set_url_scheme( \site_url() ) ); ?>"
-		>
-		<input
-			type="hidden"
-			name="timezone_offset"
-			value="<?php echo (float) ( \wp_timezone()->getOffset( new \DateTime( 'midnight' ) ) / 3600 ); ?>"
-		>
-		<input
-			type="hidden"
-			name="with-email"
-			value="yes"
-		>
+		</div>
 	</div>
 	<button id="submit-license-key" class="button button-primary"><?php \esc_html_e( 'Subscribe', 'progress-planner' ); ?></button>
 </form>
diff --git a/views/welcome.php b/views/welcome.php
index 731d63bb3..50bac6987 100644
--- a/views/welcome.php
+++ b/views/welcome.php
@@ -68,11 +68,23 @@
 				<strong><?php \esc_html_e( 'Choose your preference:', 'progress-planner' ); ?></strong>
 				<div class="prpl-onboard-form-radio-select">
 					<label>
-						<input type="radio" name="with-email" value="yes" checked>
+						<input type="radio" name="with-email" value="weekly" checked>
 						<span class="prpl-label-content">
 							<?php \esc_html_e( 'Yes, send me weekly updates!', 'progress-planner' ); ?>
 						</span>
 					</label>
+					<label>
+						<input type="radio" name="with-email" value="monthly">
+						<span class="prpl-label-content">
+							<?php \esc_html_e( 'Monthly, tell me what to do next month!', 'progress-planner' ); ?>
+						</span>
+					</label>
+					<label>
+						<input type="radio" name="with-email" value="quarterly">
+						<span class="prpl-label-content">
+							<?php \esc_html_e( 'Quarterly, just keep me posted on your plugin updates.', 'progress-planner' ); ?>
+						</span>
+					</label>
 					<label>
 						<input type="radio" name="with-email" value="no">
 						<span class="prpl-label-content">
@@ -142,7 +154,7 @@ class="prpl-input"
 						<span>
 							<input
 								type="submit"
-								value="<?php \esc_attr_e( 'Get going and send me weekly emails', 'progress-planner' ); ?>"
+								value="<?php \esc_attr_e( 'Get going and send me emails', 'progress-planner' ); ?>"
 								class="prpl-button-primary"
 							>
 						</span>