diff --git a/templates/input-submit.php b/templates/input-submit.php
index 65453d6bf978ff14b82704bc3244e5fcbb094d46..176d6d72abd5792ab97f266e3b3900531614bf16 100644
--- a/templates/input-submit.php
+++ b/templates/input-submit.php
@@ -13,16 +13,14 @@
 	<td style="padding-left:0;">
 		<p class="submit">
 			<input
-				<?php
-				if ( $field->has_classes() ) :
-					?>
-					class="<?php echo \esc_attr( $field->get_classes() ); ?>"<?php endif; ?>
-				<?php foreach ( $field->get_attributes( [] ) as $key => $value ) : ?>
+				<?php if ( $field->has_classes() ) : ?>
+					class="<?php echo \esc_attr( $field->get_classes() ); ?>"
+				<?php endif; ?>
+				<?php foreach ( $field->get_attributes() as $key => $value ) : ?>
 					<?php echo \esc_attr( $key ); ?>="<?php echo \esc_attr( $value ); ?>"
 				<?php endforeach; ?>
 				type="<?php echo \esc_attr( $field->get_type() ); ?>"
 				name="<?php echo \esc_attr( $name_prefix ); ?>[<?php echo \esc_attr( $field->get_name() ); ?>]"
-				id="<?php echo \esc_attr( $field->get_id() ); ?>"
 				value="<?php echo \esc_html( $field->get_label() ); ?>"
 			/>
 		</p>
diff --git a/templates/input.php b/templates/input.php
index 6fb3c01b8eafc02dd9d2c809a9753653ec874b07..4b8eb6a5bc3c3e485e51a07ed8e1107a8d053ac2 100644
--- a/templates/input.php
+++ b/templates/input.php
@@ -17,7 +17,6 @@ if ( $field->get_type() === 'checkbox' && $field->has_sublabel() ) :
 <input
 	type="<?php echo \esc_attr( $field->get_type() ); ?>"
 	name="<?php echo \esc_attr( $name_prefix ) . '[' . \esc_attr( $field->get_name() ) . ']'; ?>"
-	id="<?php echo \esc_attr( $field->get_id() ); ?>"
 
 	<?php if ( $field->has_classes() ) : ?>
 		class="<?php echo \esc_attr( $field->get_classes() ); ?>"