From 78bec0d62ae5508f9372a05851e02a8f2dbe715f Mon Sep 17 00:00:00 2001
From: Dharmesh Patel <dspatel44@gmail.com>
Date: Fri, 18 Jul 2025 21:40:57 +0530
Subject: [PATCH 1/4] Updated form ID ref to make it unique for each form.

---
 assets/css/frontend.css              | 12 ++--
 includes/blocks/mailchimp/edit.js    | 13 ++--
 includes/blocks/mailchimp/editor.css | 36 ++++-------
 includes/blocks/mailchimp/markup.php | 18 +++---
 mailchimp.php                        |  2 +-
 mailchimp_widget.php                 | 96 +++++++++++++++-------------
 6 files changed, 86 insertions(+), 91 deletions(-)

diff --git a/assets/css/frontend.css b/assets/css/frontend.css
index 5c6f7809..5fddac1f 100644
--- a/assets/css/frontend.css
+++ b/assets/css/frontend.css
@@ -9,7 +9,7 @@
 div.mc_interest{
 	width:100%;
 }
-#mc_signup_form label.mc_interest_label {
+.mc_signup_form label.mc_interest_label {
 	display:inline;
 }
 .mc_signup_submit {
@@ -35,7 +35,7 @@ ul.mc_list li {
 	margin-bottom: 0.75em;
 }
 .mc_custom_border_hdr,
-#mc_subheader {
+.mc_subheader {
 	line-height: 1.25em;
 	margin-bottom: 18px;
 }
@@ -86,15 +86,15 @@ select.mc_select {
 .mc_interest input {
 	margin-bottom: 0.4em;
 }
-#mc_signup_submit {
+.mc_signup_submit_button {
 	margin-top: 1.5em;
 	padding: 10px 8px;
 	width: 80%;
 }
-#mc_unsub_link a {
+.mc_unsub_link a {
 	font-size: 0.75em;
 }
-#mc_unsub_link {
+.mc_unsub_link {
 	margin-top: 1.0em;
 }
 .mc_header_address,
@@ -110,7 +110,7 @@ select.mc_select {
 .mc_email_type {
 	padding-left: 4px;
 }
-#mc-indicates-required {
+.mc-indicates-required {
 	width:100%;
 	margin-top: 1em;
 }
diff --git a/includes/blocks/mailchimp/edit.js b/includes/blocks/mailchimp/edit.js
index a45e5010..e0bc47d4 100644
--- a/includes/blocks/mailchimp/edit.js
+++ b/includes/blocks/mailchimp/edit.js
@@ -316,9 +316,9 @@ export const BlockEdit = (props) => {
 							value={header}
 							onChange={(header) => setAttributes({ header })}
 						/>
-						<div id="mc_signup">
-							<div id="mc_signup_form">
-								<div id="mc_subheader">
+						<div className="mc_signup">
+							<div className="mc_signup_form">
+								<div className="mc_subheader">
 									<RichText
 										className="mailchimp-block__sub-header"
 										tagName="h3"
@@ -347,7 +347,7 @@ export const BlockEdit = (props) => {
 										templateLock="insert"
 									/>
 									{show_required_indicator && (
-										<div id="mc-indicates-required">
+										<div className="mc-indicates-required">
 											<RichText
 												tagName="span"
 												value={required_indicator_text}
@@ -360,8 +360,7 @@ export const BlockEdit = (props) => {
 									)}
 									<div className="mc_signup_submit">
 										<RichText
-											id="mc_signup_submit"
-											className="button"
+											className="mc_signup_submit_button button"
 											tagName="button"
 											placeholder={__('Enter button text.', 'mailchimp')}
 											value={submit_text}
@@ -371,7 +370,7 @@ export const BlockEdit = (props) => {
 										/>
 									</div>
 									{!!show_unsubscribe_link && (
-										<div id="mc_unsub_link">
+										<div className="mc_unsub_link">
 											<RichText
 												tagName="a"
 												value={unsubscribe_link_text}
diff --git a/includes/blocks/mailchimp/editor.css b/includes/blocks/mailchimp/editor.css
index 31229236..00ca1815 100644
--- a/includes/blocks/mailchimp/editor.css
+++ b/includes/blocks/mailchimp/editor.css
@@ -2,7 +2,7 @@
 div.mc_interest{
 	width:100%;
 }
-#mc_signup_form label.mc_interest_label {
+.mc_signup_form label.mc_interest_label {
 	display:inline;
 }
 .mc_signup_submit {
@@ -17,7 +17,7 @@ ul.mc_list li {
 	font-size: 14px;
 }
 
-#mc_message {
+.mc_message_wrapper {
 	display: none;
 }
 
@@ -44,37 +44,32 @@ ul.mc_list li {
 }
 
 h2.mailchimp-block__header:has(span:empty),
-div#mc_subheader:has(h3 span:empty) {
+div.mc_subheader:has(h3 span:empty) {
 	display: none;
 }
 
-.wp-block-mailchimp-mailchimp.is-selected div#mc_subheader:has(h3 span:empty),
-.wp-block-mailchimp-mailchimp.has-child-selected div#mc_subheader:has(h3 span:empty),
+.wp-block-mailchimp-mailchimp.is-selected div.mc_subheader:has(h3 span:empty),
+.wp-block-mailchimp-mailchimp.has-child-selected div.mc_subheader:has(h3 span:empty),
 .wp-block-mailchimp-mailchimp.is-selected h2.mailchimp-block__header:has(span:empty),
 .wp-block-mailchimp-mailchimp.has-child-selected h2.mailchimp-block__header:has(span:empty) {
     display: block;
 }
 
-#mc_signup_form .mailchimp_merge_field_hidden .mc_var_label,
-#mc_signup_form .mailchimp_interest_group_hidden .mc_interests_header {
+.mc_signup_form .mailchimp_merge_field_hidden .mc_var_label,
+.mc_signup_form .mailchimp_interest_group_hidden .mc_interests_header {
 	padding: 0.25em 0.5em;
 	margin: 0px;
 }
 
-#mc_subheader {
+.mc_subheader {
 	line-height: 1.25em;
 	margin-bottom: 18px;
 }
 
-#mc_signup_submit {
-	margin-top: 1.5em;
-	padding: 10px 8px;
-	width: 80%;
-}
-#mc_unsub_link a {
+.mc_unsub_link a {
 	font-size: 0.75em;
 }
-#mc_unsub_link {
+.mc_unsub_link {
 	margin-top: 1.0em;
 	text-align: center;
 }
@@ -123,17 +118,12 @@ select.mc_select {
 .mc_interest input {
 	margin-bottom: 0.4em;
 }
-#mc_signup_submit {
+.mc_signup_submit_button {
 	margin-top: 1.5em;
 	padding: 10px 8px;
 	width: 80%;
 }
-#mc_unsub_link a {
-	font-size: 0.75em;
-}
-#mc_unsub_link {
-	margin-top: 1.0em;
-}
+
 .mc_header_address,
 .mc_email_format {
 	display: block;
@@ -147,7 +137,7 @@ select.mc_select {
 .mc_email_type {
 	padding-left: 4px;
 }
-#mc-indicates-required {
+.mc-indicates-required {
 	width:100%;
 	margin-top: 1em;
 }
diff --git a/includes/blocks/mailchimp/markup.php b/includes/blocks/mailchimp/markup.php
index 843e5da1..afcba6c2 100644
--- a/includes/blocks/mailchimp/markup.php
+++ b/includes/blocks/mailchimp/markup.php
@@ -13,7 +13,6 @@
 ?>
 <div <?php echo get_block_wrapper_attributes(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>>
 	<?php
-
 	// Backwards compatibility for old block, which didn't have innerBlocks.
 	$block_instance = $block->parsed_block;
 	$inner_blocks   = $block_instance['innerBlocks'] ?? [];
@@ -27,6 +26,7 @@
 
 	// Make sure we have a list ID and it's valid.
 	$list_id  = $attributes['list_id'] ?? '';
+	$form_id  = wp_unique_id( $list_id . '_' );
 	$lists    = ( new Mailchimp_List_Subscribe_Form_Blocks() )->get_lists();
 	$list_ids = array_map(
 		function ( $single_list ) {
@@ -93,7 +93,7 @@ function ( $single_list ) {
 		}
 		if ( $sub_heading ) {
 			?>
-			<div id="mc_subheader">
+			<div class="mc_subheader">
 				<h3>
 					<?php echo wp_kses_post( $sub_heading ); ?>
 				</h3>
@@ -101,9 +101,9 @@ function ( $single_list ) {
 			<?php
 		}
 		?>
-		<div id="mc_signup">
-			<form method="post" action="#mc_signup" id="mc_signup_form" class="mc_signup_form">
-				<input type="hidden" id="mc_submit_type" class="mc_submit_type" name="mc_submit_type" value="html" />
+		<div id="mc_signup_<?php echo esc_attr( $form_id ); ?>">
+			<form method="post" action="#mc_signup_<?php echo esc_attr( $form_id ); ?>" id="mc_signup_form_<?php echo esc_attr( $form_id ); ?>" class="mc_signup_form">
+				<input type="hidden" class="mc_submit_type" name="mc_submit_type" value="html" />
 				<input type="hidden" name="mcsf_action" value="mc_submit_signup_form" />
 				<input type="hidden" name="mailchimp_sf_list_id" value="<?php echo esc_attr( $list_id ); ?>" />
 				<input type="hidden" name="mailchimp_sf_update_existing_subscribers" value="<?php echo esc_attr( $update_existing_subscribers ); ?>" />
@@ -113,7 +113,7 @@ function ( $single_list ) {
 				wp_nonce_field( 'mc_submit_signup_form', '_mc_submit_signup_form_nonce', false );
 				?>
 				<div class="mc_form_inside">
-					<div class="mc_message_wrapper" id="mc_message">
+					<div class="mc_message_wrapper">
 						<?php echo wp_kses_post( mailchimp_sf_global_msg() ); ?>
 					</div>
 
@@ -132,7 +132,7 @@ function ( $single_list ) {
 					// Show an explanation of the * if there's more than one field
 					if ( $show_required_indicator ) {
 						?>
-						<div id="mc-indicates-required">
+						<div class="mc-indicates-required">
 							<?php echo esc_html( $required_indicator_text ); ?>
 						</div><!-- /mc-indicates-required -->
 						<?php
@@ -142,7 +142,7 @@ function ( $single_list ) {
 					mailchimp_sf_honeypot_field();
 					?>
 					<div class="mc_signup_submit">
-						<input type="submit" name="mc_signup_submit" class="mc_signup_submit_button" id="mc_signup_submit" value="<?php echo esc_attr( $submit_text ); ?>" class="button" />
+						<input type="submit" name="mc_signup_submit" class="mc_signup_submit_button" id="mc_signup_submit_<?php echo esc_attr( $form_id ); ?>" value="<?php echo esc_attr( $submit_text ); ?>" class="button" />
 					</div><!-- /mc_signup_submit -->
 
 					<?php
@@ -151,7 +151,7 @@ function ( $single_list ) {
 						$api  = mailchimp_sf_get_api();
 						$host = 'https://' . $api->datacenter . '.list-manage.com';
 						?>
-						<div id="mc_unsub_link" align="center">
+						<div class="mc_unsub_link" align="center">
 							<a href="<?php echo esc_url( $host . '/unsubscribe/?u=' . $user['account_id'] . '&amp;id=' . $list_id ); ?>" target="_blank">
 								<?php echo esc_html( $unsubscribe_link_text ); ?>
 							</a>
diff --git a/mailchimp.php b/mailchimp.php
index 08ff6a06..8f77f8f1 100644
--- a/mailchimp.php
+++ b/mailchimp.php
@@ -191,7 +191,7 @@ function mailchimp_sf_load_resources() {
 function mailchimp_sf_custom_style_css() {
 	ob_start();
 	?>
-	#mc_signup_form {
+	.mc_signup_form {
 		padding:5px;
 		border-width: <?php echo absint( get_option( 'mc_form_border_width' ) ); ?>px;
 		border-style: <?php echo ( get_option( 'mc_form_border_width' ) === 0 ) ? 'none' : 'solid'; ?>;
diff --git a/mailchimp_widget.php b/mailchimp_widget.php
index 1154082a..85880657 100644
--- a/mailchimp_widget.php
+++ b/mailchimp_widget.php
@@ -79,18 +79,20 @@ function mailchimp_sf_signup_form( $args = array() ) {
 	}
 
 	$sub_heading = trim( get_option( 'mc_subheader_content' ) );
+	$list_id     = get_option( 'mc_list_id' );
+	$form_id     = wp_unique_id( $list_id . '_' );
 	?>
 
-<div id="mc_signup">
-	<form method="post" action="#mc_signup" id="mc_signup_form" class="mc_signup_form">
-		<input type="hidden" id="mc_submit_type" class="mc_submit_type" name="mc_submit_type" value="html" />
+<div id="mc_signup_<?php echo esc_attr( $form_id ); ?>">
+	<form method="post" action="#mc_signup_<?php echo esc_attr( $form_id ); ?>" id="mc_signup_form_<?php echo esc_attr( $form_id ); ?>" class="mc_signup_form">
+		<input type="hidden" class="mc_submit_type" name="mc_submit_type" value="html" />
 		<input type="hidden" name="mcsf_action" value="mc_submit_signup_form" />
 		<?php wp_nonce_field( 'mc_submit_signup_form', '_mc_submit_signup_form_nonce', false ); ?>
 
 	<?php
 	if ( $sub_heading ) {
 		?>
-		<div id="mc_subheader">
+		<div class="mc_subheader">
 			<?php echo wp_kses_post( $sub_heading ); ?>
 		</div><!-- /mc_subheader -->
 		<?php
@@ -99,9 +101,9 @@ function mailchimp_sf_signup_form( $args = array() ) {
 
 	<div class="mc_form_inside">
 
-		<div class="mc_message_wrapper" id="mc_message">
+		<div class="mc_message_wrapper">
 			<?php echo wp_kses_post( mailchimp_sf_frontend_msg() ); ?>
-		</div><!-- /mc_message -->
+		</div><!-- /mc_message_wrapper -->
 
 		<?php
 		// don't show the "required" stuff if there's only 1 field to display.
@@ -126,7 +128,7 @@ function mailchimp_sf_signup_form( $args = array() ) {
 		// Show an explanation of the * if there's more than one field
 		if ( $num_fields > 1 ) {
 			?>
-			<div id="mc-indicates-required">
+			<div class="mc-indicates-required">
 				* = <?php esc_html_e( 'required field', 'mailchimp' ); ?>
 			</div><!-- /mc-indicates-required -->
 			<?php
@@ -168,8 +170,8 @@ function mailchimp_sf_signup_form( $args = array() ) {
 			<label class="mc_email_format"><?php esc_html_e( 'Preferred Format', 'mailchimp' ); ?></label>
 			<div class="field-group groups mc_email_options">
 				<ul class="mc_list">
-					<li><input type="radio" name="email_type" id="email_type_html" value="html" checked="checked"><label for="email_type_html" class="mc_email_type"><?php esc_html_e( 'HTML', 'mailchimp' ); ?></label></li>
-					<li><input type="radio" name="email_type" id="email_type_text" value="text"><label for="email_type_text" class="mc_email_type"><?php esc_html_e( 'Text', 'mailchimp' ); ?></label></li>
+					<li><input type="radio" name="email_type" id="email_type_html_<?php echo esc_attr( $form_id ); ?>" value="html" checked="checked"><label for="email_type_html_<?php echo esc_attr( $form_id ); ?>" class="mc_email_type"><?php esc_html_e( 'HTML', 'mailchimp' ); ?></label></li>
+					<li><input type="radio" name="email_type" id="email_type_text_<?php echo esc_attr( $form_id ); ?>" value="text"><label for="email_type_text_<?php echo esc_attr( $form_id ); ?>" class="mc_email_type"><?php esc_html_e( 'Text', 'mailchimp' ); ?></label></li>
 				</ul>
 			</div>
 		</div>
@@ -184,7 +186,7 @@ function mailchimp_sf_signup_form( $args = array() ) {
 		?>
 
 		<div class="mc_signup_submit">
-			<input type="submit" name="mc_signup_submit" class="mc_signup_submit_button" id="mc_signup_submit" value="<?php echo esc_attr( $submit_text ); ?>" class="button" />
+			<input type="submit" name="mc_signup_submit" class="mc_signup_submit_button" id="mc_signup_submit_<?php echo esc_attr( $form_id ); ?>" value="<?php echo esc_attr( $submit_text ); ?>" class="button" />
 		</div><!-- /mc_signup_submit -->
 
 		<?php
@@ -193,7 +195,7 @@ function mailchimp_sf_signup_form( $args = array() ) {
 			$api  = mailchimp_sf_get_api();
 			$host = 'http://' . $api->datacenter . '.list-manage.com';
 			?>
-			<div id="mc_unsub_link" align="center">
+			<div class="mc_unsub_link" align="center">
 				<a href="<?php echo esc_url( $host . '/unsubscribe/?u=' . $user['account_id'] . '&amp;id=' . get_option( 'mc_list_id' ) ); ?>" target="_blank"><?php esc_html_e( 'unsubscribe from list', 'mailchimp' ); ?></a>
 			</div><!-- /mc_unsub_link -->
 			<?php
@@ -246,10 +248,11 @@ function mailchimp_interest_group_field( $ig ) {
 			foreach ( $ig['groups'] as $interest ) {
 				$interest_name = $interest['name'];
 				$interest_id   = $interest['id'];
+				$unique_id     = wp_unique_id( 'mc_interest_' . $ig['id'] . '_' . $interest_id . '_' );
 				$html         .= '
 
-				<input type="checkbox" name="' . esc_attr( $set_name . '[' . $interest_id . ']' ) . '" id="' . esc_attr( 'mc_interest_' . $ig['id'] . '_' . $interest_id ) . '" class="mc_interest" value="' . esc_attr( $interest_name ) . '" />
-				<label for="' . esc_attr( 'mc_interest_' . $ig['id'] . '_' . $interest_id ) . '" class="mc_interest_label">' . esc_html( $interest_name ) . '</label>
+				<input type="checkbox" name="' . esc_attr( $set_name . '[' . $interest_id . ']' ) . '" id="' . esc_attr( $unique_id ) . '" class="mc_interest" value="' . esc_attr( $interest_name ) . '" />
+				<label for="' . esc_attr( $unique_id ) . '" class="mc_interest_label">' . esc_html( $interest_name ) . '</label>
 				<br/>';
 				++$i;
 			}
@@ -258,9 +261,10 @@ function mailchimp_interest_group_field( $ig ) {
 			foreach ( $ig['groups'] as $interest ) {
 				$interest_name = $interest['name'];
 				$interest_id   = $interest['id'];
+				$unique_id     = wp_unique_id( 'mc_interest_' . $ig['id'] . '_' . $interest_id . '_' );
 				$html         .= '
-				<input type="radio" name="' . esc_attr( $set_name ) . '" id="' . esc_attr( 'mc_interest_' . $ig['id'] . '_' . $interest_id ) . '" class="mc_interest" value="' . esc_attr( $interest_id ) . '"/>
-				<label for="' . esc_attr( 'mc_interest_' . $ig['id'] . '_' . $interest_id ) . '" class="mc_interest_label">' . esc_html( $interest_name ) . '</label>
+				<input type="radio" name="' . esc_attr( $set_name ) . '" id="' . esc_attr( $unique_id ) . '" class="mc_interest" value="' . esc_attr( $interest_id ) . '"/>
+				<label for="' . esc_attr( $unique_id ) . '" class="mc_interest_label">' . esc_html( $interest_name ) . '</label>
 				<br/>';
 			}
 			break;
@@ -282,9 +286,10 @@ function mailchimp_interest_group_field( $ig ) {
 			foreach ( $ig['groups'] as $interest ) {
 				$interest_name = $interest['name'];
 				$interest_id   = $interest['id'];
+				$unique_id     = wp_unique_id( 'mc_interest_' . $ig['id'] . '_' . $interest_id . '_' );
 				$html         .= '
-				<input type="checkbox" name="' . esc_attr( $set_name . '[' . $i . ']' ) . '" id="' . esc_attr( 'mc_interest_' . $ig['id'] . '_' . $interest_id ) . '" class="mc_interest" value="' . esc_attr( $interest_name ) . '" />
-				<label for="' . esc_attr( 'mc_interest_' . $ig['id'] . '_' . $interest_id ) . '" class="mc_interest_label">' . esc_html( $interest_name ) . '</label>';
+				<input type="checkbox" name="' . esc_attr( $set_name . '[' . $i . ']' ) . '" id="' . esc_attr( $unique_id ) . '" class="mc_interest" value="' . esc_attr( $interest_name ) . '" />
+				<label for="' . esc_attr( $unique_id ) . '" class="mc_interest_label">' . esc_html( $interest_name ) . '</label>';
 				++$i;
 			}
 			break;
@@ -302,8 +307,9 @@ function mailchimp_interest_group_field( $ig ) {
  * @return string
  */
 function mailchimp_form_field( $data, $num_fields, $should_display = null, $label = '' ) {
-	$html = '';
-	$opt  = 'mc_mv_' . $data['tag'];
+	$html   = '';
+	$opt    = 'mc_mv_' . $data['tag'];
+	$opt_id = wp_unique_id( $opt . '_' );
 	if ( is_null( $should_display ) ) {
 		$should_display = 'on' === get_option( $opt );
 	}
@@ -312,7 +318,7 @@ function mailchimp_form_field( $data, $num_fields, $should_display = null, $labe
 
 	// See if that var is set as required, or turned on (for display)
 	if ( $data['required'] || $should_display ) {
-		$label = '<label for="' . esc_attr( $opt ) . '" class="mc_var_label mc_header mc_header_' . esc_attr( $data['type'] ) . '">' . wp_kses_post( $label );
+		$label = '<label for="' . esc_attr( $opt_id ) . '" class="mc_var_label mc_header mc_header_' . esc_attr( $data['type'] ) . '">' . wp_kses_post( $label );
 		if ( $data['required'] && $num_fields > 1 ) {
 			$label .= '<span class="mc_required">*</span>';
 		}
@@ -324,7 +330,7 @@ function mailchimp_form_field( $data, $num_fields, $should_display = null, $labe
 		switch ( $data['type'] ) {
 			case 'date':
 				$html .= '
-	<input type="text" size="18" placeholder="' . esc_attr( $data['default_value'] ) . '" data-format="' . esc_attr( $data['options']['date_format'] ) . '" name="' . esc_attr( $opt ) . '" id="' . esc_attr( $opt ) . '" class="date-pick mc_input"/>';
+	<input type="text" size="18" placeholder="' . esc_attr( $data['default_value'] ) . '" data-format="' . esc_attr( $data['options']['date_format'] ) . '" name="' . esc_attr( $opt ) . '" id="' . esc_attr( $opt_id ) . '" class="date-pick mc_input"/>';
 				break;
 			case 'radio':
 				if ( is_array( $data['options']['choices'] ) ) {
@@ -333,8 +339,8 @@ function mailchimp_form_field( $data, $num_fields, $should_display = null, $labe
 					foreach ( $data['options']['choices'] as $key => $value ) {
 						$html .= '
 		<li>
-			<input type="radio" id="' . esc_attr( $opt . '_' . $key ) . '" name="' . esc_attr( $opt ) . '" class="mc_radio" value="' . $value . '"' . checked( $data['default_value'], $value, false ) . ' />
-			<label for="' . esc_attr( $opt . '_' . $key ) . '" class="mc_radio_label">' . esc_html( $value ) . '</label>
+			<input type="radio" id="' . esc_attr( $opt_id . '_' . $key ) . '" name="' . esc_attr( $opt ) . '" class="mc_radio" value="' . $value . '"' . checked( $data['default_value'], $value, false ) . ' />
+			<label for="' . esc_attr( $opt_id . '_' . $key ) . '" class="mc_radio_label">' . esc_html( $value ) . '</label>
 		</li>';
 					}
 					$html .= '
@@ -344,7 +350,7 @@ function mailchimp_form_field( $data, $num_fields, $should_display = null, $labe
 			case 'dropdown':
 				if ( is_array( $data['options']['choices'] ) ) {
 					$html .= '
-		<select id="' . esc_attr( $opt ) . '" name="' . esc_attr( $opt ) . '" class="mc_select">';
+		<select id="' . esc_attr( $opt_id ) . '" name="' . esc_attr( $opt ) . '" class="mc_select">';
 					foreach ( $data['options']['choices'] as $value ) {
 						$html .= '
 		<option value="' . esc_attr( $value ) . '"' . selected( $value, $data['default_value'], false ) . '>' . esc_html( $value ) . '</option>';
@@ -355,7 +361,7 @@ function mailchimp_form_field( $data, $num_fields, $should_display = null, $labe
 				break;
 			case 'birthday':
 				$html .= '
-	<input type="text" size="18" placeholder="' . esc_attr( $data['default_value'] ) . '" data-format="' . esc_attr( $data['options']['date_format'] ) . '" name="' . esc_attr( $opt ) . '" id="' . esc_attr( $opt ) . '" class="birthdate-pick mc_input"/>';
+	<input type="text" size="18" placeholder="' . esc_attr( $data['default_value'] ) . '" data-format="' . esc_attr( $data['options']['date_format'] ) . '" name="' . esc_attr( $opt ) . '" id="' . esc_attr( $opt_id ) . '" class="birthdate-pick mc_input"/>';
 				break;
 			case 'birthday-old':
 				$days   = range( 1, 31 );
@@ -375,7 +381,7 @@ function mailchimp_form_field( $data, $num_fields, $should_display = null, $labe
 				);
 
 				$html .= '
-	<br /><select id="' . esc_attr( $opt ) . '" name="' . esc_attr( $opt . '[month]' ) . '" class="mc_select">';
+	<br /><select id="' . esc_attr( $opt_id ) . '" name="' . esc_attr( $opt . '[month]' ) . '" class="mc_select">';
 				foreach ( $months as $month_key => $month ) {
 					$html .= '
 		<option value="' . $month_key . '">' . $month . '</option>';
@@ -384,7 +390,7 @@ function mailchimp_form_field( $data, $num_fields, $should_display = null, $labe
 	</select>';
 
 				$html .= '
-	<select id="' . esc_attr( $opt ) . '" name="' . esc_attr( $opt . '[day]' ) . '" class="mc_select">';
+	<select id="' . esc_attr( $opt_id ) . '" name="' . esc_attr( $opt . '[day]' ) . '" class="mc_select">';
 				foreach ( $days as $day ) {
 					$html .= '
 		<option value="' . $day . '">' . $day . '</option>';
@@ -396,18 +402,18 @@ function mailchimp_form_field( $data, $num_fields, $should_display = null, $labe
 				$countries = mailchimp_country_list();
 				$html     .= '
 
-	<label for="' . esc_attr( $opt . '-addr1' ) . '" class="mc_address_label">' . esc_html__( 'Street Address', 'mailchimp' ) . '</label>
-	<input type="text" size="18" value="" name="' . esc_attr( $opt . '[addr1]' ) . '" id="' . esc_attr( $opt . '-addr1' ) . '" class="mc_input" />
-	<label for="' . esc_attr( $opt . '-addr2' ) . '" class="mc_address_label">' . esc_html__( 'Address Line 2', 'mailchimp' ) . '</label>
-	<input type="text" size="18" value="" name="' . esc_attr( $opt . '[addr2]' ) . '" id="' . esc_attr( $opt . '-addr2' ) . '" class="mc_input" />
-	<label for="' . esc_attr( $opt . '-city' ) . '" class="mc_address_label">' . esc_html__( 'City', 'mailchimp' ) . '</label>
-	<input type="text" size="18" value="" name="' . esc_attr( $opt . '[city]' ) . '" id="' . esc_attr( $opt . '-city' ) . '" class="mc_input" />
-	<label for="' . esc_attr( $opt . '-state' ) . '" class="mc_address_label">' . esc_html__( 'State', 'mailchimp' ) . '</label>
-	<input type="text" size="18" value="" name="' . esc_attr( $opt . '[state]' ) . '" id="' . esc_attr( $opt . '-state' ) . '" class="mc_input" />
-	<label for="' . esc_attr( $opt . '-zip' ) . '" class="mc_address_label">' . esc_html__( 'Zip / Postal', 'mailchimp' ) . '</label>
-	<input type="text" size="18" value="" maxlength="5" name="' . esc_attr( $opt . '[zip]' ) . '" id="' . esc_attr( $opt . '-zip' ) . '" class="mc_input" />
-	<label for="' . esc_attr( $opt . '-country' ) . '" class="mc_address_label">' . esc_html__( 'Country', 'mailchimp' ) . '</label>
-	<select name="' . esc_attr( $opt . '[country]' ) . '" id="' . esc_attr( $opt . '-country' ) . '">';
+	<label for="' . esc_attr( $opt_id . '-addr1' ) . '" class="mc_address_label">' . esc_html__( 'Street Address', 'mailchimp' ) . '</label>
+	<input type="text" size="18" value="" name="' . esc_attr( $opt . '[addr1]' ) . '" id="' . esc_attr( $opt_id . '-addr1' ) . '" class="mc_input" />
+	<label for="' . esc_attr( $opt_id . '-addr2' ) . '" class="mc_address_label">' . esc_html__( 'Address Line 2', 'mailchimp' ) . '</label>
+	<input type="text" size="18" value="" name="' . esc_attr( $opt . '[addr2]' ) . '" id="' . esc_attr( $opt_id . '-addr2' ) . '" class="mc_input" />
+	<label for="' . esc_attr( $opt_id . '-city' ) . '" class="mc_address_label">' . esc_html__( 'City', 'mailchimp' ) . '</label>
+	<input type="text" size="18" value="" name="' . esc_attr( $opt . '[city]' ) . '" id="' . esc_attr( $opt_id . '-city' ) . '" class="mc_input" />
+	<label for="' . esc_attr( $opt_id . '-state' ) . '" class="mc_address_label">' . esc_html__( 'State', 'mailchimp' ) . '</label>
+	<input type="text" size="18" value="" name="' . esc_attr( $opt . '[state]' ) . '" id="' . esc_attr( $opt_id . '-state' ) . '" class="mc_input" />
+	<label for="' . esc_attr( $opt_id . '-zip' ) . '" class="mc_address_label">' . esc_html__( 'Zip / Postal', 'mailchimp' ) . '</label>
+	<input type="text" size="18" value="" maxlength="5" name="' . esc_attr( $opt . '[zip]' ) . '" id="' . esc_attr( $opt_id . '-zip' ) . '" class="mc_input" />
+	<label for="' . esc_attr( $opt_id . '-country' ) . '" class="mc_address_label">' . esc_html__( 'Country', 'mailchimp' ) . '</label>
+	<select name="' . esc_attr( $opt . '[country]' ) . '" id="' . esc_attr( $opt_id . '-country' ) . '">';
 				foreach ( $countries as $country_code => $country_name ) {
 					$html .= '
 		<option value="' . esc_attr( $country_code ) . '"' . selected( $country_code, $data['options']['default_country'], false ) . '>' . esc_html( $country_name ) . '</option>';
@@ -417,18 +423,18 @@ function mailchimp_form_field( $data, $num_fields, $should_display = null, $labe
 				break;
 			case 'zip':
 				$html .= '
-	<input type="text" size="18" maxlength="5" value="" name="' . esc_attr( $opt ) . '" id="' . esc_attr( $opt ) . '" class="mc_input" />';
+	<input type="text" size="18" maxlength="5" value="" name="' . esc_attr( $opt ) . '" id="' . esc_attr( $opt_id ) . '" class="mc_input" />';
 				break;
 			case 'phone':
 				if ( isset( $data['options']['phone_format'] ) && 'US' === $data['options']['phone_format'] ) {
 					$html .= '
-			<input type="text" size="2" maxlength="3" value="" name="' . esc_attr( $opt . '[area]' ) . '" id="' . esc_attr( $opt . '-area' ) . '" class="mc_input mc_phone" />
-			<input type="text" size="2" maxlength="3" value="" name="' . esc_attr( $opt . '[detail1]' ) . '" id="' . esc_attr( $opt . '-detail1' ) . '" class="mc_input mc_phone" />
-			<input type="text" size="5" maxlength="4" value="" name="' . esc_attr( $opt . '[detail2]' ) . '" id="' . esc_attr( $opt . '-detail2' ) . '" class="mc_input mc_phone" />
+			<input type="text" size="2" maxlength="3" value="" name="' . esc_attr( $opt . '[area]' ) . '" id="' . esc_attr( $opt_id . '-area' ) . '" class="mc_input mc_phone" />
+			<input type="text" size="2" maxlength="3" value="" name="' . esc_attr( $opt . '[detail1]' ) . '" id="' . esc_attr( $opt_id . '-detail1' ) . '" class="mc_input mc_phone" />
+			<input type="text" size="5" maxlength="4" value="" name="' . esc_attr( $opt . '[detail2]' ) . '" id="' . esc_attr( $opt_id . '-detail2' ) . '" class="mc_input mc_phone" />
 				';
 				} else {
 					$html .= '
-						<input type="text" size="18" value="" name="' . esc_attr( $opt ) . '" id="' . esc_attr( $opt ) . '" class="mc_input" />
+						<input type="text" size="18" value="" name="' . esc_attr( $opt ) . '" id="' . esc_attr( $opt_id ) . '" class="mc_input" />
 					';
 				}
 				break;
@@ -439,7 +445,7 @@ function mailchimp_form_field( $data, $num_fields, $should_display = null, $labe
 			case 'number':
 			default:
 				$html .= '
-	<input type="text" size="18" placeholder="' . esc_attr( $data['default_value'] ) . '" name="' . esc_attr( $opt ) . '" id="' . esc_attr( $opt ) . '" class="mc_input"/>';
+	<input type="text" size="18" placeholder="' . esc_attr( $data['default_value'] ) . '" name="' . esc_attr( $opt ) . '" id="' . esc_attr( $opt_id ) . '" class="mc_input"/>';
 				break;
 		}
 		if ( ! empty( $data['help_text'] ) ) {

From 04892e40f8bcc372a4d19af91c25127f4e97983f Mon Sep 17 00:00:00 2001
From: Dharmesh Patel <dspatel44@gmail.com>
Date: Fri, 18 Jul 2025 21:43:35 +0530
Subject: [PATCH 2/4] Remove multiple: false restriction on block.

---
 includes/blocks/mailchimp/block.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/includes/blocks/mailchimp/block.json b/includes/blocks/mailchimp/block.json
index fd6292eb..9ead5a09 100644
--- a/includes/blocks/mailchimp/block.json
+++ b/includes/blocks/mailchimp/block.json
@@ -42,7 +42,6 @@
   },
   "supports": {
     "html": false,
-    "multiple": false,
     "reusable": true,
     "align": [ "wide", "full" ],
     "__experimentalBorder": {

From 36406e3da0264b0c88abcbdcd0864b2a5bcb8e11 Mon Sep 17 00:00:00 2001
From: Dharmesh Patel <dspatel44@gmail.com>
Date: Fri, 18 Jul 2025 21:44:53 +0530
Subject: [PATCH 3/4] Remove FAQ "Can I have multiple forms on one page?"

---
 README.md  | 4 ----
 readme.txt | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/README.md b/README.md
index c558fd8f..697c2cb8 100644
--- a/README.md
+++ b/README.md
@@ -73,10 +73,6 @@ If you are upgrading to version 1.6.0, you will need to updated any references t
 
 ## Frequently Asked Questions
 
-### Can I have multiple forms on one page?
-
-No, only one form should exist per page, no matter the display type (block, widget, or shortcode).
-
 ### Why am I not seeing all my fields in my form?
 
 You need to ensure that the fields are enabled both in your Mailchimp account (Audience > Signup forms) and in the settings of this plugin.  Once the fields are enabled in both places, then they'll appear in the editor and frontend of your site.
diff --git a/readme.txt b/readme.txt
index 3de1bf31..7e9907e1 100644
--- a/readme.txt
+++ b/readme.txt
@@ -37,10 +37,6 @@ If these constants are added after you've already authenticated with Mailchimp,
 
 == Frequently Asked Questions ==
 
-= Can I have multiple forms on one page? =
-
-No, only one form should exist per page, no matter the display type (block, widget, or shortcode).
-
 = Why am I not seeing all my fields in my form? =
 
 You need to ensure that the fields are enabled both in your Mailchimp account (Audience > Signup forms) and in the settings of this plugin.  Once the fields are enabled in both places, then they'll appear in the editor and frontend of your site.

From 2c5ce1a596143c46cf984989f7b9b2cfbe4dad92 Mon Sep 17 00:00:00 2001
From: Dharmesh Patel <dspatel44@gmail.com>
Date: Fri, 18 Jul 2025 22:43:50 +0530
Subject: [PATCH 4/4] E2E: Update E2E tests.

---
 tests/cypress/e2e/block.test.js               | 70 +++++++--------
 tests/cypress/e2e/settings/list.test.js       |  4 +-
 tests/cypress/e2e/settings/settings.test.js   | 62 ++++++-------
 .../e2e/submission/js-submission.test.js      | 18 ++--
 .../cypress/e2e/submission/subscribe.test.js  | 10 +--
 .../e2e/submission/update-subscribers.test.js | 18 ++--
 tests/cypress/e2e/validation/address.test.js  | 18 ++--
 tests/cypress/e2e/validation/email.test.js    | 28 +++---
 tests/cypress/e2e/validation/us-phone.test.js | 14 +--
 .../validate-required-fields.test.js          | 86 ++++++++++++-------
 .../validate-unrequired-fields.test.js        | 28 +++---
 tests/cypress/fixtures/mergeFields.json       |  2 +-
 tests/cypress/support/commands/submission.js  |  4 +-
 13 files changed, 193 insertions(+), 169 deletions(-)

diff --git a/tests/cypress/e2e/block.test.js b/tests/cypress/e2e/block.test.js
index a492046b..2bf40e80 100644
--- a/tests/cypress/e2e/block.test.js
+++ b/tests/cypress/e2e/block.test.js
@@ -23,10 +23,10 @@ describe('Block Tests', () => {
 			if (postBlock) {
 				postId = postBlock.id;
 				cy.visit(`/?p=${postId}`);
-				cy.get('#mc_signup').should('exist');
-				cy.get('#mc_mv_EMAIL').should('exist');
-				cy.get('#mc_signup_submit').should('exist');
-				cy.get('#mc_signup_submit').click();
+				cy.get('.mc_signup_form').should('exist');
+				cy.get('input[id^="mc_mv_EMAIL"]').should('exist');
+				cy.get('.mc_signup_submit_button').should('exist');
+				cy.get('.mc_signup_submit_button').click();
 				cy.get('.mc_error_msg').should('exist');
 				cy.get('.mc_error_msg').contains('Email Address: This value should not be blank.');
 			}
@@ -52,8 +52,8 @@ describe('Block Tests', () => {
 		// Verify
 		cy.visit(`/?p=${postId}`);
 		cy.get('.mc_custom_border_hdr').contains(header);
-		cy.get('#mc_subheader').contains(subHeader);
-		cy.get('#mc_signup_submit').contains(button);
+		cy.get('.mc_subheader').first().contains(subHeader);
+		cy.get('.mc_signup_submit_button').contains(button);
 	});
 
 	it('Admin can re-order form fields in block', () => {
@@ -104,7 +104,7 @@ describe('Block Tests', () => {
 
 		// Verify
 		cy.visit(`/?p=${postId}`);
-		cy.get('#mc_mv_FNAME').should('not.exist');
+		cy.get('input[id^="mc_mv_FNAME"]').should('not.exist');
 
 		// Show First name field
 		cy.visit(`/wp-admin/post.php?post=${postId}&action=edit`);
@@ -120,7 +120,7 @@ describe('Block Tests', () => {
 
 		// Verify
 		cy.visit(`/?p=${postId}`);
-		cy.get('#mc_mv_FNAME').should('exist');
+		cy.get('input[id^="mc_mv_FNAME"]').should('exist');
 	});
 
 	it('Admin can show/hide groups from block settings', () => {
@@ -168,8 +168,8 @@ describe('Block Tests', () => {
 
 		// Verify
 		cy.visit(`/?p=${postId}`);
-		cy.get('#mc_mv_EMAIL').should('exist');
-		cy.get('label[for="mc_mv_EMAIL"]').contains(emailLabel);
+		cy.get('input[id^="mc_mv_EMAIL"]').should('exist');
+		cy.get('label[for^="mc_mv_EMAIL"]').first().contains(emailLabel);
 	});
 
 	it('Admin can show/hide unsubscribe link from block settings', () => {
@@ -183,7 +183,7 @@ describe('Block Tests', () => {
 
 		// Verify
 		cy.visit(`/?p=${postId}`);
-		cy.get('#mc_unsub_link').should('exist');
+		cy.get('.mc_unsub_link').first().should('exist');
 
 		// Reset
 		cy.visit(`/wp-admin/post.php?post=${postId}&action=edit`);
@@ -195,7 +195,7 @@ describe('Block Tests', () => {
 
 		// Verify
 		cy.visit(`/?p=${postId}`);
-		cy.get('#mc_unsub_link').should('not.exist');
+		cy.get('.mc_unsub_link').should('not.exist');
 	});
 
 	it('Admin can change audience list from block settings', () => {
@@ -213,9 +213,9 @@ describe('Block Tests', () => {
 
 		// Verify
 		cy.visit(`/?p=${postId}`);
-		cy.get('#mc_signup').should('exist');
-		cy.get('#mc_mv_EMAIL').should('exist');
-		cy.get('#mc_signup_submit').should('exist');
+		cy.get('.mc_signup_form').should('exist');
+		cy.get('input[id^="mc_mv_EMAIL"]').should('exist');
+		cy.get('.mc_signup_submit_button').should('exist');
 
 		// Reset
 		cy.visit(`/wp-admin/post.php?post=${postId}&action=edit`);
@@ -234,9 +234,9 @@ describe('Block Tests', () => {
 		).then((response) => {
 			const oldBlockPostId = response.stdout;
 			cy.visit(`/?p=${oldBlockPostId}`);
-			cy.get('#mc_signup').should('exist');
-			cy.get('#mc_mv_EMAIL').should('exist');
-			cy.get('#mc_signup_submit').should('exist');
+			cy.get('.mc_signup_form').should('exist');
+			cy.get('input[id^="mc_mv_EMAIL"]').should('exist');
+			cy.get('.mc_signup_submit_button').should('exist');
 
 			cy.visit(`/wp-admin/post.php?post=${oldBlockPostId}&action=edit`);
 			const header = '[NEW BLOCK] Subscribe to our newsletter';
@@ -266,10 +266,10 @@ describe('Block Tests', () => {
 
 		// Verify
 		cy.visit(`/?p=${postId}`);
-		cy.get('#mc_mv_EMAIL').should('exist');
-		cy.get('#mc_mv_EMAIL').clear().type('unsubscribed_user@gmail.com');
-		cy.get('#mc_signup_submit').should('exist');
-		cy.get('#mc_signup_submit').click();
+		cy.get('input[id^="mc_mv_EMAIL"]').should('exist');
+		cy.get('input[id^="mc_mv_EMAIL"]').clear().type('unsubscribed_user@gmail.com');
+		cy.get('.mc_signup_submit_button').should('exist');
+		cy.get('.mc_signup_submit_button').click();
 		cy.get('.mc_error_msg').should('exist');
 		cy.get('.mc_error_msg').contains(
 			'The email address cannot be subscribed because it was previously unsubscribed, bounced, or is under review. Please sign up here.',
@@ -289,26 +289,26 @@ describe('Block Tests', () => {
 		const firstName = 'John';
 		const lastName = 'Doe';
 		cy.visit(`/?p=${postId}`);
-		cy.get('#mc_mv_EMAIL').should('exist');
-		cy.get('#mc_mv_FNAME').clear().type(firstName);
-		cy.get('#mc_mv_LNAME').clear().type(lastName);
-		cy.get('#mc_signup_submit').should('exist');
-		cy.get('#mc_signup_submit').click();
+		cy.get('input[id^="mc_mv_EMAIL"]').should('exist');
+		cy.get('input[id^="mc_mv_FNAME"]').clear().type(firstName);
+		cy.get('input[id^="mc_mv_LNAME"]').clear().type(lastName);
+		cy.get('.mc_signup_submit_button').should('exist');
+		cy.get('.mc_signup_submit_button').click();
 		cy.get('.mc_error_msg').should('exist');
 		cy.get('.mc_error_msg').contains('Email Address: This value should not be blank.');
-		cy.get('#mc_mv_FNAME').should('have.value', firstName);
-		cy.get('#mc_mv_LNAME').should('have.value', lastName);
+		cy.get('input[id^="mc_mv_FNAME"]').should('have.value', firstName);
+		cy.get('input[id^="mc_mv_LNAME"]').should('have.value', lastName);
 	});
 
 	it('Spam protection should work as expected', () => {
 		// Show error message to spam bots.
 		cy.visit(`/?p=${postId}`);
-		cy.get('#mc_signup').should('exist');
+		cy.get('.mc_signup_form').should('exist');
 		cy.get('input[name="mailchimp_sf_alt_email"]').then((el) => {
 			el.val('123');
 		});
-		cy.get('#mc_signup_submit').should('exist');
-		cy.get('#mc_signup_submit').click();
+		cy.get('.mc_signup_submit_button').should('exist');
+		cy.get('.mc_signup_submit_button').click();
 		cy.get('.mc_error_msg').should('exist');
 		cy.get('.mc_error_msg').contains(
 			"We couldn't process your submission as it was flagged as potential spam",
@@ -316,9 +316,9 @@ describe('Block Tests', () => {
 
 		// Normal user should not see the error message.
 		cy.visit(`/?p=${postId}`);
-		cy.get('#mc_signup').should('exist');
-		cy.get('#mc_signup_submit').should('exist');
-		cy.get('#mc_signup_submit').click();
+		cy.get('.mc_signup_form').should('exist');
+		cy.get('.mc_signup_submit_button').should('exist');
+		cy.get('.mc_signup_submit_button').click();
 		cy.get('.mc_error_msg').should('exist');
 		cy.get('.mc_error_msg').contains('Email Address: This value should not be blank.');
 	});
diff --git a/tests/cypress/e2e/settings/list.test.js b/tests/cypress/e2e/settings/list.test.js
index 2c1d76f6..2198a03c 100644
--- a/tests/cypress/e2e/settings/list.test.js
+++ b/tests/cypress/e2e/settings/list.test.js
@@ -48,10 +48,10 @@ describe('Mailchimp lists ', () => {
 	it('Admin that has never saved a list can not see the form on the front end', () => {
 		cy.wpCli('wp option delete mc_list_id').then(() => {
 			cy.visit(shortcodePostURL);
-			cy.get('#mc_signup_form').should('not.exist');
+			cy.get('.mc_signup_form').should('not.exist');
 
 			cy.visit(blockPostPostURL);
-			cy.get('#mc_signup_form').should('not.exist');
+			cy.get('.mc_signup_form').should('not.exist');
 
 			cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
 			cy.selectList('10up');
diff --git a/tests/cypress/e2e/settings/settings.test.js b/tests/cypress/e2e/settings/settings.test.js
index adb63701..b21ebd89 100644
--- a/tests/cypress/e2e/settings/settings.test.js
+++ b/tests/cypress/e2e/settings/settings.test.js
@@ -31,8 +31,8 @@ describe('Admin can update plugin settings', () => {
 		[shortcodePostURL, blockPostPostURL].forEach((url) => {
 			cy.visit(url);
 			cy.get('.mc_custom_border_hdr').contains(header);
-			cy.get('#mc_subheader').contains(subHeader);
-			cy.get('#mc_signup_submit').contains(button);
+			cy.get('.mc_subheader').first().contains(subHeader);
+			cy.get('.mc_signup_submit_button').contains(button);
 		});
 	});
 
@@ -54,11 +54,11 @@ describe('Admin can update plugin settings', () => {
 		// Verify
 		[shortcodePostURL, blockPostPostURL].forEach((url) => {
 			cy.visit(url);
-			cy.get('#mc_mv_FNAME').should('not.exist');
-			cy.get('#mc_mv_LNAME').should('not.exist');
-			cy.get('#mc_mv_ADDRESS-addr1').should('not.exist'); // The address field has several inputs
-			cy.get('#mc_mv_BIRTHDAY').should('not.exist');
-			cy.get('#mc_mv_COMPANY').should('not.exist');
+			cy.get('input[id^="mc_mv_FNAME"]').should('not.exist');
+			cy.get('input[id^="mc_mv_LNAME"]').should('not.exist');
+			cy.get('input[name="mc_mv_ADDRESS[addr1]"]').should('not.exist'); // The address field has several inputs
+			cy.get('input[id^="mc_mv_BIRTHDAY"]').should('not.exist');
+			cy.get('input[id^="mc_mv_COMPANY"]').should('not.exist');
 		});
 
 		// Reset and recheck all merge fields
@@ -73,11 +73,11 @@ describe('Admin can update plugin settings', () => {
 		// Verify
 		[shortcodePostURL, blockPostPostURL].forEach((url) => {
 			cy.visit(url);
-			cy.get('#mc_mv_FNAME').should('exist');
-			cy.get('#mc_mv_LNAME').should('exist');
-			cy.get('#mc_mv_ADDRESS-addr1').should('exist'); // The address field has several inputs
-			cy.get('#mc_mv_BIRTHDAY').should('exist');
-			cy.get('#mc_mv_COMPANY').should('exist');
+			cy.get('input[id^="mc_mv_FNAME"]').should('exist');
+			cy.get('input[id^="mc_mv_LNAME"]').should('exist');
+			cy.get('input[name="mc_mv_ADDRESS[addr1]"]').should('exist'); // The address field has several inputs
+			cy.get('input[id^="mc_mv_BIRTHDAY"]').should('exist');
+			cy.get('input[id^="mc_mv_COMPANY"]').should('exist');
 		});
 	});
 
@@ -118,7 +118,7 @@ describe('Admin can update plugin settings', () => {
 		// Verify
 		[shortcodePostURL, blockPostPostURL].forEach((url) => {
 			cy.visit(url);
-			cy.get('#mc_unsub_link').should('exist');
+			cy.get('.mc_unsub_link').first().should('exist');
 		});
 
 		// Reset
@@ -128,7 +128,7 @@ describe('Admin can update plugin settings', () => {
 
 		[shortcodePostURL, blockPostPostURL].forEach((url) => {
 			cy.visit(url);
-			cy.get('#mc_unsub_link').should('not.exist');
+			cy.get('.mc_unsub_link').should('not.exist');
 		});
 	});
 
@@ -141,10 +141,10 @@ describe('Admin can update plugin settings', () => {
 		// Verify
 		[shortcodePostURL, blockPostPostURL].forEach((url) => {
 			cy.visit(url);
-			cy.get('#mc_mv_EMAIL').should('exist');
-			cy.get('#mc_mv_EMAIL').clear().type('unsubscribed_user@gmail.com');
-			cy.get('#mc_signup_submit').should('exist');
-			cy.get('#mc_signup_submit').click();
+			cy.get('input[id^="mc_mv_EMAIL"]').should('exist');
+			cy.get('input[id^="mc_mv_EMAIL"]').clear().type('unsubscribed_user@gmail.com');
+			cy.get('.mc_signup_submit_button').should('exist');
+			cy.get('.mc_signup_submit_button').click();
 			cy.get('.mc_error_msg').should('exist');
 			cy.get('.mc_error_msg').contains(
 				'The email address cannot be subscribed because it was previously unsubscribed, bounced, or is under review. Please sign up here.',
@@ -164,15 +164,15 @@ describe('Admin can update plugin settings', () => {
 			const firstName = 'John';
 			const lastName = 'Doe';
 			cy.visit(url);
-			cy.get('#mc_mv_EMAIL').should('exist');
-			cy.get('#mc_mv_FNAME').clear().type(firstName);
-			cy.get('#mc_mv_LNAME').clear().type(lastName);
-			cy.get('#mc_signup_submit').should('exist');
-			cy.get('#mc_signup_submit').click();
+			cy.get('input[id^="mc_mv_EMAIL"]').should('exist');
+			cy.get('input[id^="mc_mv_FNAME"]').clear().type(firstName);
+			cy.get('input[id^="mc_mv_LNAME"]').clear().type(lastName);
+			cy.get('.mc_signup_submit_button').should('exist');
+			cy.get('.mc_signup_submit_button').click();
 			cy.get('.mc_error_msg').should('exist');
 			cy.get('.mc_error_msg').contains('Email Address: This value should not be blank.');
-			cy.get('#mc_mv_FNAME').should('have.value', firstName);
-			cy.get('#mc_mv_LNAME').should('have.value', lastName);
+			cy.get('input[id^="mc_mv_FNAME"]').should('have.value', firstName);
+			cy.get('input[id^="mc_mv_LNAME"]').should('have.value', lastName);
 		});
 	});
 
@@ -211,12 +211,12 @@ describe('Admin can update plugin settings', () => {
 		// Show error message to spam bots.
 		[shortcodePostURL, blockPostPostURL].forEach((url) => {
 			cy.visit(url);
-			cy.get('#mc_signup').should('exist');
+			cy.get('.mc_signup_form').should('exist');
 			cy.get('input[name="mailchimp_sf_alt_email"]').then((el) => {
 				el.val('123');
 			});
-			cy.get('#mc_signup_submit').should('exist');
-			cy.get('#mc_signup_submit').click();
+			cy.get('.mc_signup_submit_button').should('exist');
+			cy.get('.mc_signup_submit_button').click();
 			cy.get('.mc_error_msg').should('exist');
 			cy.get('.mc_error_msg').contains(
 				"We couldn't process your submission as it was flagged as potential spam",
@@ -224,9 +224,9 @@ describe('Admin can update plugin settings', () => {
 
 			// Normal user should not see the error message.
 			cy.visit(url);
-			cy.get('#mc_signup').should('exist');
-			cy.get('#mc_signup_submit').should('exist');
-			cy.get('#mc_signup_submit').click();
+			cy.get('.mc_signup_form').should('exist');
+			cy.get('.mc_signup_submit_button').should('exist');
+			cy.get('.mc_signup_submit_button').click();
 			cy.get('.mc_error_msg').should('exist');
 			cy.get('.mc_error_msg').contains('Email Address: This value should not be blank.');
 		});
diff --git a/tests/cypress/e2e/submission/js-submission.test.js b/tests/cypress/e2e/submission/js-submission.test.js
index 5a43d455..572d2626 100644
--- a/tests/cypress/e2e/submission/js-submission.test.js
+++ b/tests/cypress/e2e/submission/js-submission.test.js
@@ -25,20 +25,20 @@ describe('JavaScript submission', () => {
 	function setUpForm() {
 		// Step 1: Assert form contains setup elements
 		// Email
-		cy.get('#mc_signup').should('exist');
-		cy.get('#mc_mv_EMAIL').should('exist');
-		cy.get('#mc_signup_submit').should('exist');
+		cy.get('.mc_signup_form').should('exist');
+		cy.get('input[id^="mc_mv_EMAIL"]').should('exist');
+		cy.get('.mc_signup_submit_button').should('exist');
 	}
 
 	function submitEmail(email) {
 		// Step 2: Fill in the required fields (email and other merge fields)
-		cy.get('#mc_mv_EMAIL').type(email);
+		cy.get('input[id^="mc_mv_EMAIL"]').type(email);
 
 		// Step 3: Assert that the submit button is enabled and exists
-		cy.get('#mc_signup_submit').should('exist').and('be.enabled');
+		cy.get('.mc_signup_submit_button').should('exist').and('be.enabled');
 
 		// Step 4: Submit the form
-		cy.get('#mc_signup_submit').click();
+		cy.get('.mc_signup_submit_button').click();
 	}
 
 	beforeEach(() => {
@@ -50,7 +50,7 @@ describe('JavaScript submission', () => {
 		submitEmail('invalidemail@--'); // Submit blank email
 
 		// Step 4: Assert that the submit button is disabled after submitting the form
-		cy.get('#mc_signup_submit').should('be.disabled');
+		cy.get('.mc_signup_submit_button').should('be.disabled');
 
 		// Step 5: Verify that the form submission failed
 		cy.get('.mc_error_msg').should('exist');
@@ -64,10 +64,10 @@ describe('JavaScript submission', () => {
 		cy.get('.mc_success_msg').should('exist').contains('success', { matchCase: false });
 
 		// Step 6: Verify that the form fields are cleared
-		cy.get('#mc_mv_EMAIL').should('have.value', '');
+		cy.get('input[id^="mc_mv_EMAIL"]').should('have.value', '');
 
 		// Step 7: Verify that the submit button is re-enabled
-		cy.get('#mc_signup_submit').should('be.enabled');
+		cy.get('.mc_signup_submit_button').should('be.enabled');
 
 		cy.wait(1000);
 
diff --git a/tests/cypress/e2e/submission/subscribe.test.js b/tests/cypress/e2e/submission/subscribe.test.js
index 910b8af5..99205a2e 100644
--- a/tests/cypress/e2e/submission/subscribe.test.js
+++ b/tests/cypress/e2e/submission/subscribe.test.js
@@ -15,18 +15,18 @@ describe('Subscribe actions', () => {
 		cy.visit(url);
 
 		// Step 3: Verify the form is displayed
-		cy.get('#mc_signup').should('exist');
-		cy.get('#mc_mv_EMAIL').should('exist');
-		cy.get('#mc_signup_submit').should('exist');
+		cy.get('.mc_signup_form').should('exist');
+		cy.get('input[id^="mc_mv_EMAIL"]').should('exist');
+		cy.get('.mc_signup_submit_button').should('exist');
 
 		// Step 4: Test error handling
-		cy.get('#mc_signup_submit').click();
+		cy.get('.mc_signup_submit_button').click();
 		cy.get('.mc_error_msg').should('exist');
 		cy.get('.mc_error_msg').contains('Email Address: This value should not be blank.');
 
 		// Step 5: Test that the form can be submitted
 		const email = generateRandomEmail('shortcode-signup-test');
-		cy.get('#mc_mv_EMAIL').type(email);
+		cy.get('input[id^="mc_mv_EMAIL"]').type(email);
 
 		// Step 6: Verify that the form was submitted successfully
 		cy.submitFormAndVerifyWPSuccess();
diff --git a/tests/cypress/e2e/submission/update-subscribers.test.js b/tests/cypress/e2e/submission/update-subscribers.test.js
index b27974c5..93c0dc6c 100644
--- a/tests/cypress/e2e/submission/update-subscribers.test.js
+++ b/tests/cypress/e2e/submission/update-subscribers.test.js
@@ -45,9 +45,9 @@ describe('Update Existing Subscriber?', () => {
 		const lastName = generateRandomString();
 
 		// Fill the form and submit it
-		cy.get('#mc_mv_EMAIL').clear().type(email);
-		cy.get('#mc_mv_FNAME').clear().type(firstName);
-		cy.get('#mc_mv_LNAME').clear().type(lastName);
+		cy.get('input[id^="mc_mv_EMAIL"]').clear().type(email);
+		cy.get('input[id^="mc_mv_FNAME"]').clear().type(firstName);
+		cy.get('input[id^="mc_mv_LNAME"]').clear().type(lastName);
 
 		// Submit and assert success
 		cy.submitFormAndVerifyWPSuccess();
@@ -69,9 +69,9 @@ describe('Update Existing Subscriber?', () => {
 		const lastName = generateRandomString();
 
 		// Fill the form and submit it
-		cy.get('#mc_mv_EMAIL').clear().type(email);
-		cy.get('#mc_mv_FNAME').clear().type(firstName);
-		cy.get('#mc_mv_LNAME').clear().type(lastName);
+		cy.get('input[id^="mc_mv_EMAIL"]').clear().type(email);
+		cy.get('input[id^="mc_mv_FNAME"]').clear().type(firstName);
+		cy.get('input[id^="mc_mv_LNAME"]').clear().type(lastName);
 
 		// Submit and assert success
 		cy.submitFormAndVerifyWPSuccess();
@@ -103,9 +103,9 @@ describe('Update Existing Subscriber?', () => {
 		cy.visit(blockPostPostURL);
 
 		// Fill the form and submit it
-		cy.get('#mc_mv_EMAIL').clear().type(email);
-		cy.get('#mc_mv_FNAME').clear().type('Should not submit');
-		cy.get('#mc_mv_LNAME').clear().type('Should not submit');
+		cy.get('input[id^="mc_mv_EMAIL"]').clear().type(email);
+		cy.get('input[id^="mc_mv_FNAME"]').clear().type('Should not submit');
+		cy.get('input[id^="mc_mv_LNAME"]').clear().type('Should not submit');
 
 		// Verify error
 		cy.submitFormAndVerifyError();
diff --git a/tests/cypress/e2e/validation/address.test.js b/tests/cypress/e2e/validation/address.test.js
index 5ddc2942..49e204a8 100644
--- a/tests/cypress/e2e/validation/address.test.js
+++ b/tests/cypress/e2e/validation/address.test.js
@@ -50,12 +50,12 @@ describe('Address Field Validation', () => {
 			cy.visit(blockPostPostURL);
 
 			const email = generateRandomEmail('validemail');
-			cy.get('#mc_mv_EMAIL').type(email);
-			cy.get('#mc_mv_ADDRESS-addr1').clear().type(address.addr1);
-			cy.get('#mc_mv_ADDRESS-city').clear().type(address.city);
-			cy.get('#mc_mv_ADDRESS-state').clear().type(address.state);
-			cy.get('#mc_mv_ADDRESS-zip').type(address.zip);
-			cy.get('#mc_mv_ADDRESS-country').type(address.country);
+			cy.get('input[id^="mc_mv_EMAIL"]').type(email);
+			cy.get('input[name="mc_mv_ADDRESS[addr1]"]').clear().type(address.addr1);
+			cy.get('input[name="mc_mv_ADDRESS[city]"]').clear().type(address.city);
+			cy.get('input[name="mc_mv_ADDRESS[state]"]').clear().type(address.state);
+			cy.get('input[name="mc_mv_ADDRESS[zip]"]').type(address.zip);
+			cy.get('select[name="mc_mv_ADDRESS[country]"]').type(address.country);
 			cy.submitFormAndVerifyWPSuccess();
 
 			// Delete contact to clean up
@@ -68,13 +68,13 @@ describe('Address Field Validation', () => {
 			cy.visit(blockPostPostURL);
 
 			const email = generateRandomEmail('invalidemail');
-			cy.get('#mc_mv_EMAIL').type(email);
+			cy.get('input[id^="mc_mv_EMAIL"]').type(email);
 
 			if (address.addr1 !== '') {
-				cy.get('#mc_mv_ADDRESS-addr1').clear().type(address.addr1);
+				cy.get('input[name="mc_mv_ADDRESS[addr1]"]').clear().type(address.addr1);
 			}
 			if (address.city !== '') {
-				cy.get('#mc_mv_ADDRESS-city').clear().type(address.city);
+				cy.get('input[name="mc_mv_ADDRESS[city]"]').clear().type(address.city);
 			}
 
 			cy.submitFormAndVerifyError();
diff --git a/tests/cypress/e2e/validation/email.test.js b/tests/cypress/e2e/validation/email.test.js
index 7d5246a8..697d37a4 100644
--- a/tests/cypress/e2e/validation/email.test.js
+++ b/tests/cypress/e2e/validation/email.test.js
@@ -34,55 +34,55 @@ describe('General merge field validation', () => {
 		cy.visit(blockPostPostURL);
 
 		// Ensure the form exists
-		cy.get('#mc_signup').should('exist');
-		cy.get('#mc_mv_EMAIL').should('exist');
-		cy.get('#mc_signup_submit').should('exist');
+		cy.get('.mc_signup_form').should('exist');
+		cy.get('input[id^="mc_mv_EMAIL"]').should('exist');
+		cy.get('.mc_signup_submit_button').should('exist');
 
 		// Email assertions
-		cy.get('#mc_mv_EMAIL').clear(); // No email
+		cy.get('input[id^="mc_mv_EMAIL"]').clear(); // No email
 		cy.submitFormAndVerifyError();
 		cy.get('.mc_error_msg').contains('Email Address: This value should not be blank.');
 
-		cy.get('#mc_mv_EMAIL').clear().type('user@'); // Missing domain
+		cy.get('input[id^="mc_mv_EMAIL"]').clear().type('user@'); // Missing domain
 		cy.submitFormAndVerifyError();
 		cy.get('.mc_error_msg').contains(invalidEmailErrorRegex);
 
-		cy.get('#mc_mv_EMAIL').clear().type('@example.com'); // Missing username
+		cy.get('input[id^="mc_mv_EMAIL"]').clear().type('@example.com'); // Missing username
 		cy.submitFormAndVerifyError();
 		cy.get('.mc_error_msg').contains(invalidEmailErrorRegex);
 
-		cy.get('#mc_mv_EMAIL').clear().type('userexample.com'); // Missing '@' symbol
+		cy.get('input[id^="mc_mv_EMAIL"]').clear().type('userexample.com'); // Missing '@' symbol
 		cy.submitFormAndVerifyError();
 		cy.get('.mc_error_msg').contains(invalidEmailErrorRegex);
 
-		cy.get('#mc_mv_EMAIL').clear().type('user..name@example.com'); // Consecutive dots
+		cy.get('input[id^="mc_mv_EMAIL"]').clear().type('user..name@example.com'); // Consecutive dots
 		cy.submitFormAndVerifyError();
 		cy.get('.mc_error_msg').contains(invalidEmailErrorRegex);
 
-		cy.get('#mc_mv_EMAIL').clear().type('user!#%&*{}@example.com'); // Invalid characters
+		cy.get('input[id^="mc_mv_EMAIL"]').clear().type('user!#%&*{}@example.com'); // Invalid characters
 		cy.submitFormAndVerifyError();
 		cy.get('.mc_error_msg').contains(invalidEmailErrorRegex);
 
-		cy.get('#mc_mv_EMAIL').clear().type('user@example'); // Missing top-level domain
+		cy.get('input[id^="mc_mv_EMAIL"]').clear().type('user@example'); // Missing top-level domain
 		cy.submitFormAndVerifyError();
 		cy.get('.mc_error_msg').contains(invalidEmailErrorRegex);
 
-		cy.get('#mc_mv_EMAIL').clear().type('user@-example.com'); // Domain starting with dash
+		cy.get('input[id^="mc_mv_EMAIL"]').clear().type('user@-example.com'); // Domain starting with dash
 		cy.submitFormAndVerifyError();
 		cy.get('.mc_error_msg').contains(invalidEmailErrorRegex);
 
 		// TODO: Mailchimp accepts this. Is this a bug?
-		// cy.get('#mc_mv_EMAIL').clear().type('user@example-.com'); // Domain ending with dash
+		// cy.get('input[id^="mc_mv_EMAIL"]').clear().type('user@example-.com'); // Domain ending with dash
 		// cy.submitFormAndVerifyError();
 		// cy.get('.mc_error_msg').contains(invalidEmailErrorRegex);
 
-		cy.get('#mc_mv_EMAIL').clear().type('"user@example.com'); // Unclosed quoted string
+		cy.get('input[id^="mc_mv_EMAIL"]').clear().type('"user@example.com'); // Unclosed quoted string
 		cy.submitFormAndVerifyError();
 		cy.get('.mc_error_msg').contains(invalidEmailErrorRegex);
 
 		// Test exceeding maximum email length
 		let longEmail = 'a'.repeat(245) + '@example.com';
-		cy.get('#mc_mv_EMAIL').clear().type(longEmail);
+		cy.get('input[id^="mc_mv_EMAIL"]').clear().type(longEmail);
 		cy.submitFormAndVerifyError();
 		cy.get('.mc_error_msg').contains(invalidEmailErrorRegex);
 	});
diff --git a/tests/cypress/e2e/validation/us-phone.test.js b/tests/cypress/e2e/validation/us-phone.test.js
index a523a7fc..47cd5cce 100644
--- a/tests/cypress/e2e/validation/us-phone.test.js
+++ b/tests/cypress/e2e/validation/us-phone.test.js
@@ -59,9 +59,9 @@ describe.skip('US Multi-Input Phone Number Validation', () => {
 	});
 
 	function fillPhoneInputs(phone) {
-		cy.get('#mc_mv_PHONE-area').clear().type(phone.area);
-		cy.get('#mc_mv_PHONE-detail1').clear().type(phone.detail1);
-		cy.get('#mc_mv_PHONE-detail2').clear().type(phone.detail2);
+		cy.get('input[name="mc_mv_PHONE[area]"]').clear().type(phone.area);
+		cy.get('input[name="mc_mv_PHONE[detail1]"]').clear().type(phone.detail1);
+		cy.get('input[name="mc_mv_PHONE[detail2]"]').clear().type(phone.detail2);
 	}
 
 	it('Valid phone numbers', () => {
@@ -69,7 +69,7 @@ describe.skip('US Multi-Input Phone Number Validation', () => {
 
 		validPhones.forEach((phone) => {
 			const email = generateRandomEmail('validphone');
-			cy.get('#mc_mv_EMAIL').type(email);
+			cy.get('input[id^="mc_mv_EMAIL"]').type(email);
 			fillPhoneInputs(phone);
 			cy.submitFormAndVerifyWPSuccess();
 
@@ -83,7 +83,7 @@ describe.skip('US Multi-Input Phone Number Validation', () => {
 
 		invalidPhones.forEach((phone) => {
 			const email = generateRandomEmail('invalidphone');
-			cy.get('#mc_mv_EMAIL').type(email);
+			cy.get('input[id^="mc_mv_EMAIL"]').type(email);
 			fillPhoneInputs(phone);
 			cy.submitFormAndVerifyError();
 			cy.get('.mc_error_msg').contains('must consist of only numbers');
@@ -95,7 +95,7 @@ describe.skip('US Multi-Input Phone Number Validation', () => {
 
 		tooShortPhones.forEach((phone) => {
 			const email = generateRandomEmail('shortphone');
-			cy.get('#mc_mv_EMAIL').type(email);
+			cy.get('input[id^="mc_mv_EMAIL"]').type(email);
 			fillPhoneInputs(phone);
 			cy.submitFormAndVerifyError();
 			cy.get('.mc_error_msg').contains('Phone number is too short');
@@ -103,7 +103,7 @@ describe.skip('US Multi-Input Phone Number Validation', () => {
 
 		tooLongPhones.forEach((phone) => {
 			const email = generateRandomEmail('longphone');
-			cy.get('#mc_mv_EMAIL').type(email);
+			cy.get('input[id^="mc_mv_EMAIL"]').type(email);
 			fillPhoneInputs(phone);
 			cy.submitFormAndVerifyError();
 			cy.get('.mc_error_msg').contains('Phone number is too long');
diff --git a/tests/cypress/e2e/validation/validate-required-fields.test.js b/tests/cypress/e2e/validation/validate-required-fields.test.js
index 9bbff306..5ebdeafa 100644
--- a/tests/cypress/e2e/validation/validate-required-fields.test.js
+++ b/tests/cypress/e2e/validation/validate-required-fields.test.js
@@ -7,20 +7,36 @@ describe('Validate required fields', () => {
 
 	// (almost) the same in the WP admin as on the FE
 	const requiredFields = [
-		{ selector: '#mc_mv_FNAME', errorMessage: 'First Name:', input: 'Test' },
-		{ selector: '#mc_mv_LNAME', errorMessage: 'Last Name:', input: 'User' },
-		{ selector: '#mc_mv_ADDRESS-addr1', errorMessage: 'Address:', input: '123 Fake St.' }, // Address has sub fields on the FE form
-		{ selector: '#mc_mv_ADDRESS-city', errorMessage: 'Address:', input: 'Nashville' }, // Address has sub fields on the FE form
-		{ selector: '#mc_mv_ADDRESS-state', errorMessage: 'Address:', input: 'TN' }, // Address has sub fields on the FE form
-		{ selector: '#mc_mv_ADDRESS-zip', errorMessage: 'Address:', input: '12345' }, // Address has sub fields on the FE form
-		{ selector: '#mc_mv_BIRTHDAY', errorMessage: 'Birthday:', input: '01/10' },
-		{ selector: '#mc_mv_COMPANY', errorMessage: 'Company:', input: '10up' },
-		{ selector: '#mc_mv_PHONE', errorMessage: 'Phone Number:', input: '555-555-5555' },
-		{ selector: '#mc_mv_MMERGE8', errorMessage: 'Date:', input: '01/01/2030' },
-		{ selector: '#mc_mv_MMERGE9', errorMessage: 'Zip Code:', input: '12345' },
-		{ selector: '#mc_mv_MMERGE10', errorMessage: 'Website:', input: 'https://10up.com' },
+		{ selector: 'input[id^="mc_mv_FNAME"]', errorMessage: 'First Name:', input: 'Test' },
+		{ selector: 'input[id^="mc_mv_LNAME"]', errorMessage: 'Last Name:', input: 'User' },
 		{
-			selector: '#mc_mv_MMERGE11',
+			selector: 'input[name="mc_mv_ADDRESS[addr1]"]',
+			errorMessage: 'Address:',
+			input: '123 Fake St.',
+		}, // Address has sub fields on the FE form
+		{
+			selector: 'input[name="mc_mv_ADDRESS[city]"]',
+			errorMessage: 'Address:',
+			input: 'Nashville',
+		}, // Address has sub fields on the FE form
+		{ selector: 'input[name="mc_mv_ADDRESS[state]"]', errorMessage: 'Address:', input: 'TN' }, // Address has sub fields on the FE form
+		{ selector: 'input[name="mc_mv_ADDRESS[zip]"]', errorMessage: 'Address:', input: '12345' }, // Address has sub fields on the FE form
+		{ selector: 'input[id^="mc_mv_BIRTHDAY"]', errorMessage: 'Birthday:', input: '01/10' },
+		{ selector: 'input[id^="mc_mv_COMPANY"]', errorMessage: 'Company:', input: '10up' },
+		{
+			selector: 'input[name="mc_mv_PHONE"]',
+			errorMessage: 'Phone Number:',
+			input: '555-555-5555',
+		},
+		{ selector: 'input[id^="mc_mv_MMERGE8"]', errorMessage: 'Date:', input: '01/01/2030' },
+		{ selector: 'input[id^="mc_mv_MMERGE9"]', errorMessage: 'Zip Code:', input: '12345' },
+		{
+			selector: 'input[id^="mc_mv_MMERGE10"]',
+			errorMessage: 'Website:',
+			input: 'https://10up.com',
+		},
+		{
+			selector: 'input[id^="mc_mv_MMERGE11"]',
 			errorMessage: 'Image:',
 			input: 'https://10up.com/wp-content/themes/10up-sept2016/assets/img/icon-strategy.png',
 		},
@@ -29,11 +45,19 @@ describe('Validate required fields', () => {
 	const requiredSelectFields = [
 		// Country is selected by default so no need to test this validation
 		// { selector: '#mc_mv_ADDRESS-country', errorMessage: 'Address:', input: 'USA' }, // Address has sub fields on the FE form
-		{ selector: '#mc_mv_MMERGE7', errorMessage: 'Choose one:', input: 'First Choice' },
+		{
+			selector: 'select[id^="mc_mv_MMERGE7"]',
+			errorMessage: 'Choose one:',
+			input: 'First Choice',
+		},
 	];
 
 	const requiredCheckboxFields = [
-		{ selector: '#mc_mv_MMERGE6_0', errorMessage: 'Choose one:', input: 'First Choice' },
+		{
+			selector: 'input[name="mc_mv_MMERGE6"]',
+			errorMessage: 'Choose one:',
+			input: 'First Choice',
+		},
 	];
 
 	before(() => {
@@ -89,14 +113,14 @@ describe('Validate required fields', () => {
 	// TODO: Validation errors clear the entire form. We should fix this.
 	// We could also significantly reduce the time this test takes by fixing this bug.
 	function fillOutAllFields() {
-		cy.get('#mc_mv_EMAIL').clear().type(email); // Email is always required
+		cy.get('input[id^="mc_mv_EMAIL"]').clear().type(email); // Email is always required
 
 		requiredFields.forEach((field) => {
-			if (field.selector === '#mc_mv_PHONE') {
+			if (field.selector === 'input[name="mc_mv_PHONE"]') {
 				const phone = field.input.split('-');
-				cy.get('#mc_mv_PHONE-area').clear().type(phone[0]);
-				cy.get('#mc_mv_PHONE-detail1').clear().type(phone[1]);
-				cy.get('#mc_mv_PHONE-detail2').clear().type(phone[2]);
+				cy.get('input[name="mc_mv_PHONE[area]"]').clear().type(phone[0]);
+				cy.get('input[name="mc_mv_PHONE[detail1]"]').clear().type(phone[1]);
+				cy.get('input[name="mc_mv_PHONE[detail2]"]').clear().type(phone[2]);
 			} else {
 				cy.get(field.selector).clear().type(field.input);
 			}
@@ -109,7 +133,7 @@ describe('Validate required fields', () => {
 		});
 
 		requiredCheckboxFields.forEach((field) => {
-			cy.get(field.selector).check();
+			cy.get(field.selector).first().check();
 			cy.get('body').click(0, 0); // Click outside the field to clear the datepicker modal
 		});
 	}
@@ -119,7 +143,7 @@ describe('Validate required fields', () => {
 		cy.visit(blockPostPostURL);
 
 		// Ensure the form exists
-		cy.get('#mc_signup').should('exist');
+		cy.get('.mc_signup_form').should('exist');
 
 		// Fill out entire form everytime so we can narrow tests to one input at a time
 		fillOutAllFields();
@@ -127,26 +151,26 @@ describe('Validate required fields', () => {
 		// Test validation for each required field
 		requiredFields.forEach((field) => {
 			// Submit the form without input to trigger validation
-			if (field.selector === '#mc_mv_PHONE') {
-				cy.get('#mc_mv_PHONE-area').clear();
-				cy.get('#mc_mv_PHONE-detail1').clear();
-				cy.get('#mc_mv_PHONE-detail2').clear();
+			if (field.selector === 'input[name="mc_mv_PHONE"]') {
+				cy.get('input[name="mc_mv_PHONE[area]"]').clear();
+				cy.get('input[name="mc_mv_PHONE[detail1]"]').clear();
+				cy.get('input[name="mc_mv_PHONE[detail2]"]').clear();
 			} else {
 				cy.get(field.selector).clear(); // Ensure field is empty
 			}
 			cy.get('body').click(0, 0); // Click outside the field to clear the datepicker modal
-			cy.get('#mc_signup_submit').click();
+			cy.get('.mc_signup_submit_button').click();
 
 			// Assert the error message is displayed
 			cy.get('.mc_error_msg').should('exist');
 			cy.get('.mc_error_msg').should('include.text', field.errorMessage);
 
 			// Fill in the field
-			if (field.selector === '#mc_mv_PHONE') {
+			if (field.selector === 'input[name="mc_mv_PHONE"]') {
 				const phone = field.input.split('-');
-				cy.get('#mc_mv_PHONE-area').clear().type(phone[0]);
-				cy.get('#mc_mv_PHONE-detail1').clear().type(phone[1]);
-				cy.get('#mc_mv_PHONE-detail2').clear().type(phone[2]);
+				cy.get('input[name="mc_mv_PHONE[area]"]').clear().type(phone[0]);
+				cy.get('input[name="mc_mv_PHONE[detail1]"]').clear().type(phone[1]);
+				cy.get('input[name="mc_mv_PHONE[detail2]"]').clear().type(phone[2]);
 			} else {
 				cy.get(field.selector).type(field.input);
 			}
diff --git a/tests/cypress/e2e/validation/validate-unrequired-fields.test.js b/tests/cypress/e2e/validation/validate-unrequired-fields.test.js
index d14bf41b..64c840bf 100644
--- a/tests/cypress/e2e/validation/validate-unrequired-fields.test.js
+++ b/tests/cypress/e2e/validation/validate-unrequired-fields.test.js
@@ -35,27 +35,27 @@ describe('Validate unrequired fields', () => {
 		[shortcodePostURL, blockPostPostURL].forEach((url) => {
 			cy.visit(url);
 
-			cy.get('#mc_signup').should('exist');
-			cy.get('#mc_mv_EMAIL').should('exist');
-			cy.get('#mc_signup_submit').should('exist');
+			cy.get('.mc_signup_form').should('exist');
+			cy.get('input[id^="mc_mv_EMAIL"]').should('exist');
+			cy.get('.mc_signup_submit_button').should('exist');
 
 			// Optional merge fields
-			cy.get('#mc_mv_FNAME').should('exist');
-			cy.get('#mc_mv_LNAME').should('exist');
-			cy.get('#mc_mv_ADDRESS-addr1').should('exist'); // Address line 1
-			cy.get('#mc_mv_ADDRESS-addr2').should('exist'); // Address line 2
-			cy.get('#mc_mv_ADDRESS-city').should('exist'); // City
-			cy.get('#mc_mv_ADDRESS-state').should('exist'); // State
-			cy.get('#mc_mv_ADDRESS-zip').should('exist'); // ZIP code
-			cy.get('#mc_mv_ADDRESS-country').should('exist'); // Country
-			cy.get('#mc_mv_BIRTHDAY').should('exist');
-			cy.get('#mc_mv_COMPANY').should('exist');
+			cy.get('input[id^="mc_mv_FNAME"]').should('exist');
+			cy.get('input[id^="mc_mv_LNAME"]').should('exist');
+			cy.get('input[name="mc_mv_ADDRESS[addr1]"]').should('exist'); // Address line 1
+			cy.get('input[name="mc_mv_ADDRESS[addr2]"]').should('exist'); // Address line 2
+			cy.get('input[name="mc_mv_ADDRESS[city]"]').should('exist'); // City
+			cy.get('input[name="mc_mv_ADDRESS[state]"]').should('exist'); // State
+			cy.get('input[name="mc_mv_ADDRESS[zip]"]').should('exist'); // ZIP code
+			cy.get('select[name="mc_mv_ADDRESS[country]"]').should('exist'); // Country
+			cy.get('input[id^="mc_mv_BIRTHDAY"]').should('exist');
+			cy.get('input[id^="mc_mv_COMPANY"]').should('exist');
 
 			// Validation assertions
 
 			// Email is required
 			const email = generateRandomEmail('unrequired-validation-test');
-			cy.get('#mc_mv_EMAIL').type(email);
+			cy.get('input[id^="mc_mv_EMAIL"]').type(email);
 
 			// Step 6: Verify that the form was submitted successfully
 			cy.submitFormAndVerifyWPSuccess();
diff --git a/tests/cypress/fixtures/mergeFields.json b/tests/cypress/fixtures/mergeFields.json
index 8871858f..7eb50236 100644
--- a/tests/cypress/fixtures/mergeFields.json
+++ b/tests/cypress/fixtures/mergeFields.json
@@ -5,4 +5,4 @@
     "BIRTHDAY": "#mc_mv_BIRTHDAY",
     "COMPANY": "#mc_mv_COMPANY",
     "PHONE": "#mc_mv_PHONE"
-}
\ No newline at end of file
+}
diff --git a/tests/cypress/support/commands/submission.js b/tests/cypress/support/commands/submission.js
index 9880c6f1..83ed0d00 100644
--- a/tests/cypress/support/commands/submission.js
+++ b/tests/cypress/support/commands/submission.js
@@ -3,7 +3,7 @@
  */
 Cypress.Commands.add('submitFormAndVerifyWPSuccess', () => {
 	// Submit the form
-	cy.get('#mc_signup_submit').click();
+	cy.get('.mc_signup_submit_button').click();
 
 	// Verify that the form was submitted successfully
 	cy.get('.mc_success_msg').should('exist');
@@ -14,7 +14,7 @@ Cypress.Commands.add('submitFormAndVerifyWPSuccess', () => {
  */
 Cypress.Commands.add('submitFormAndVerifyError', () => {
     // Submit the form
-    cy.get('#mc_signup_submit').click();
+    cy.get('.mc_signup_submit_button').click();
 
     // Verify that the form submission failed
     cy.get('.mc_error_msg').should('exist');