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/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/block.json b/includes/blocks/mailchimp/block.json
index 476b4d52..c5049bed 100644
--- a/includes/blocks/mailchimp/block.json
+++ b/includes/blocks/mailchimp/block.json
@@ -46,7 +46,6 @@
   },
   "supports": {
     "html": false,
-    "multiple": false,
     "reusable": true,
     "align": [ "wide", "full" ],
     "__experimentalBorder": {
diff --git a/includes/blocks/mailchimp/edit.js b/includes/blocks/mailchimp/edit.js
index da4d2467..aaa97b87 100644
--- a/includes/blocks/mailchimp/edit.js
+++ b/includes/blocks/mailchimp/edit.js
@@ -328,9 +328,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"
@@ -359,7 +359,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}
@@ -372,8 +372,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}
@@ -383,7 +382,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 d37c65c8..67203318 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 79bd4fcc..2c9a8a80 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 ) {
@@ -96,7 +96,7 @@ function ( $single_list ) {
 		}
 		if ( $sub_heading ) {
 			?>
-			<div id="mc_subheader">
+			<div class="mc_subheader">
 				<h3>
 					<?php echo wp_kses_post( $sub_heading ); ?>
 				</h3>
@@ -104,9 +104,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 ); ?>" />
@@ -117,7 +117,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>
 
@@ -136,7 +136,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
@@ -146,7 +146,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
@@ -155,7 +155,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 1082e59b..f2918272 100644
--- a/mailchimp.php
+++ b/mailchimp.php
@@ -192,7 +192,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 6e9a36ff..3ef5cedf 100644
--- a/mailchimp_widget.php
+++ b/mailchimp_widget.php
@@ -84,21 +84,23 @@ 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 . '_' );
 	if ( $is_preview && ! empty( $preview_data ) ) {
 		$sub_heading = $preview_data['sub_heading'] ?? $sub_heading;
 	}
 	?>
 
-<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
@@ -107,9 +109,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.
@@ -144,7 +146,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
@@ -190,8 +192,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>
@@ -211,7 +213,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
@@ -225,7 +227,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
@@ -278,10 +280,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;
 			}
@@ -290,9 +293,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;
@@ -314,9 +318,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;
@@ -334,8 +339,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 );
 	}
@@ -344,7 +350,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>';
 		}
@@ -356,7 +362,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'] ) ) {
@@ -365,8 +371,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 .= '
@@ -376,7 +382,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>';
@@ -387,7 +393,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 );
@@ -407,7 +413,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>';
@@ -416,7 +422,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>';
@@ -428,18 +434,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>';
@@ -449,12 +455,12 @@ 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':
 				$is_us_phone = isset( $data['options']['phone_format'] ) && 'US' === $data['options']['phone_format'];
 				$html       .= '
-					<input type="tel" size="20" minlength="6" maxlength="20" pattern="^\+?[\d\s\-\(\)\.]*$" value="" name="' . esc_attr( $opt ) . '" id="' . esc_attr( $opt ) . '" class="mc_input mailchimp-sf-phone" placeholder="' . esc_attr( $is_us_phone ? '(###) ### - ####' : '' ) . '" />';
+					<input type="tel" size="20" minlength="6" maxlength="20" pattern="^\+?[\d\s\-\(\)\.]*$" value="" name="' . esc_attr( $opt ) . '" id="' . esc_attr( $opt_id ) . '" class="mc_input mailchimp-sf-phone" placeholder="' . esc_attr( $is_us_phone ? '(###) ### - ####' : '' ) . '" />';
 				break;
 			case 'email':
 			case 'url':
@@ -463,7 +469,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'] ) ) {
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.
diff --git a/tests/cypress/e2e/block.test.js b/tests/cypress/e2e/block.test.js
index 33e987f6..6ba5f7ec 100644
--- a/tests/cypress/e2e/block.test.js
+++ b/tests/cypress/e2e/block.test.js
@@ -30,10 +30,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('Please enter your email address.');
 			}
@@ -60,8 +60,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', () => {
@@ -114,7 +114,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`);
@@ -130,7 +130,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', () => {
@@ -178,8 +178,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', () => {
@@ -193,7 +193,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`);
@@ -205,7 +205,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', () => {
@@ -223,9 +223,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`);
@@ -244,9 +244,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`);
 			cy.getBlockEditor()
@@ -281,10 +281,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.',
@@ -304,26 +304,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('Please enter your email address.');
-		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",
@@ -331,9 +331,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('Please enter your email address.');
 	});
diff --git a/tests/cypress/e2e/settings/list.test.js b/tests/cypress/e2e/settings/list.test.js
index 059be20f..c26f21af 100644
--- a/tests/cypress/e2e/settings/list.test.js
+++ b/tests/cypress/e2e/settings/list.test.js
@@ -49,10 +49,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 930d6e51..cfaaf6e8 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
@@ -74,11 +74,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');
 		});
 	});
 
@@ -122,7 +122,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
@@ -133,7 +133,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');
 		});
 	});
 
@@ -147,10 +147,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.',
@@ -171,15 +171,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('Please enter your email address.');
-			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);
 		});
 	});
 
@@ -218,12 +218,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",
@@ -231,9 +231,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('Please enter your email address.');
 		});
diff --git a/tests/cypress/e2e/submission/js-submission.test.js b/tests/cypress/e2e/submission/js-submission.test.js
index f82f99a3..83647476 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@test.com'); // 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 c5d3076d..2697859c 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('Please enter your email address.');
 
 		// 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 8f7221e5..7bb16cd6 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 e1cf1e8f..7c8849cf 100644
--- a/tests/cypress/e2e/validation/email.test.js
+++ b/tests/cypress/e2e/validation/email.test.js
@@ -35,54 +35,54 @@ 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('Please enter your email address.');
 
-		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);
 
-		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 36cf3b80..a73b44e3 100644
--- a/tests/cypress/e2e/validation/us-phone.test.js
+++ b/tests/cypress/e2e/validation/us-phone.test.js
@@ -48,7 +48,7 @@ describe('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();
 
@@ -62,10 +62,10 @@ describe('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.get('#mc_signup_submit').click();
-			cy.get('#mc_mv_PHONE:invalid')
+			cy.get('input[name="mc_signup_submit"][type="submit"]').click();
+			cy.get('input[id^="mc_mv_PHONE"]:invalid')
 				.invoke('prop', 'validationMessage')
 				.should('equal', 'Please enter a valid phone number.');
 		});
diff --git a/tests/cypress/e2e/validation/validate-required-fields.test.js b/tests/cypress/e2e/validation/validate-required-fields.test.js
index f9e79c14..77c415ba 100644
--- a/tests/cypress/e2e/validation/validate-required-fields.test.js
+++ b/tests/cypress/e2e/validation/validate-required-fields.test.js
@@ -7,28 +7,60 @@ describe('Validate required fields', () => {
 
 	// (almost) the same in the WP admin as on the FE
 	const requiredFields = [
-		{ selector: '#mc_mv_FNAME', errorMessage: 'You must fill in First Name', input: 'Test' },
-		{ selector: '#mc_mv_LNAME', errorMessage: 'You must fill in 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: 'You must fill in Birthday', input: '01/10' },
-		{ selector: '#mc_mv_COMPANY', errorMessage: 'You must fill in Company', input: '10up' },
 		{
-			selector: '#mc_mv_PHONE',
+			selector: 'input[id^="mc_mv_FNAME"]',
+			errorMessage: 'You must fill in First Name',
+			input: 'Test',
+		},
+		{
+			selector: 'input[id^="mc_mv_LNAME"]',
+			errorMessage: 'You must fill in Last Name',
+			input: 'User',
+		},
+		{
+			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: 'You must fill in Birthday',
+			input: '01/10',
+		},
+		{
+			selector: 'input[id^="mc_mv_COMPANY"]',
+			errorMessage: 'You must fill in Company',
+			input: '10up',
+		},
+		{
+			selector: 'input[name="mc_mv_PHONE"]',
 			errorMessage: 'You must fill in Phone Number.',
 			input: '555-555-5555',
 		},
-		{ selector: '#mc_mv_MMERGE8', errorMessage: 'You must fill in Date.', input: '01/01/2030' },
-		{ selector: '#mc_mv_MMERGE9', errorMessage: 'You must fill in Zip Code.', input: '12345' },
 		{
-			selector: '#mc_mv_MMERGE10',
+			selector: 'input[id^="mc_mv_MMERGE8"]',
+			errorMessage: 'You must fill in Date.',
+			input: '01/01/2030',
+		},
+		{
+			selector: 'input[id^="mc_mv_MMERGE9"]',
+			errorMessage: 'You must fill in Zip Code.',
+			input: '12345',
+		},
+		{
+			selector: 'input[id^="mc_mv_MMERGE10"]',
 			errorMessage: 'You must fill in Website.',
 			input: 'https://10up.com',
 		},
 		{
-			selector: '#mc_mv_MMERGE11',
+			selector: 'input[id^="mc_mv_MMERGE11"]',
 			errorMessage: 'You must fill in Image.',
 			input: 'https://10up.com/wp-content/themes/10up-sept2016/assets/img/icon-strategy.png',
 		},
@@ -37,11 +69,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(() => {
@@ -95,7 +135,7 @@ describe('Validate required fields', () => {
 	});
 
 	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) => {
 			cy.get(field.selector).clear().type(field.input);
@@ -108,7 +148,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
 		});
 	}
@@ -117,7 +157,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();
@@ -126,7 +166,7 @@ describe('Validate required fields', () => {
 		requiredFields.forEach((field) => {
 			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');
diff --git a/tests/cypress/e2e/validation/validate-unrequired-fields.test.js b/tests/cypress/e2e/validation/validate-unrequired-fields.test.js
index f4411ecf..2c080bd7 100644
--- a/tests/cypress/e2e/validation/validate-unrequired-fields.test.js
+++ b/tests/cypress/e2e/validation/validate-unrequired-fields.test.js
@@ -36,27 +36,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');