diff --git a/class-two-factor-core.php b/class-two-factor-core.php
index c034c53d..3c68aab5 100644
--- a/class-two-factor-core.php
+++ b/class-two-factor-core.php
@@ -2047,6 +2047,7 @@ public static function user_two_factor_options( $user ) {
 		<?php endforeach; ?>
 
 		<fieldset id="two-factor-options" <?php echo $show_2fa_options ? '' : 'disabled="disabled"'; ?>>
+		<legend class="screen-reader-text"><?php esc_html_e( 'Two-Factor Options', 'two-factor' ); ?></legend>
 		<?php
 		if ( $providers ) {
 			self::render_user_providers_form( $user, $providers );
@@ -2161,9 +2162,9 @@ private static function render_user_providers_form( $user, $providers ) {
 		<table class="form-table two-factor-primary-method-table" role="presentation">
 			<tbody>
 				<tr>
-					<th><?php esc_html_e( 'Primary Method', 'two-factor' ); ?></th>
+					<th><label for="two-factor-primary-provider"><?php esc_html_e( 'Primary Method', 'two-factor' ); ?></label></th>
 					<td>
-						<select name="<?php echo esc_attr( self::PROVIDER_USER_META_KEY ); ?>">
+						<select id="two-factor-primary-provider" name="<?php echo esc_attr( self::PROVIDER_USER_META_KEY ); ?>">
 							<option value=""><?php echo esc_html( __( 'Default', 'two-factor' ) ); ?></option>
 							<?php foreach ( $providers as $provider_key => $object ) : ?>
 								<option value="<?php echo esc_attr( $provider_key ); ?>" <?php selected( $provider_key, $primary_provider_key ); ?> <?php disabled( ! in_array( $provider_key, $enabled_providers, true ) ); ?>>