diff --git a/Sources/Poll.php b/Sources/Poll.php
index 24e28e1368..7249b986e4 100644
--- a/Sources/Poll.php
+++ b/Sources/Poll.php
@@ -426,7 +426,7 @@ public function format(array $format_options = []): array
 
 			// Now add it to the poll's contextual theme data.
 			$this->formatted['choices'][$i] = [
-				'id' => 'options-' . $i,
+				'id' => $i,
 				'number' => ++$choice_number,
 				'percent' => $bar,
 				'votes' => $option->votes,
diff --git a/Sources/ServerSideIncludes.php b/Sources/ServerSideIncludes.php
index b718bfd78e..e7352f416b 100644
--- a/Sources/ServerSideIncludes.php
+++ b/Sources/ServerSideIncludes.php
@@ -1875,7 +1875,7 @@ public static function recentPoll(bool $topPollInstead = false, string $output_m
 
 			foreach ($return['options'] as $option) {
 				echo '
-					<label for="', $option['id'], '">', $option['vote_button'], ' ', $option['option'], '</label><br>';
+					<label for="options-', $option['id'], '">', $option['vote_button'], ' ', $option['option'], '</label><br>';
 			}
 
 			echo '
@@ -1966,7 +1966,7 @@ public static function showPoll(?int $topic = null, string $output_method = 'ech
 
 			foreach ($return['options'] as $option) {
 				echo '
-					<label for="', $option['id'], '">', $option['vote_button'], ' ', $option['option'], '</label><br>';
+					<label for="options-', $option['id'], '">', $option['vote_button'], ' ', $option['option'], '</label><br>';
 			}
 
 			echo '
diff --git a/Themes/default/Display.template.php b/Themes/default/Display.template.php
index e3b6ba7f73..0fca29d0c5 100644
--- a/Themes/default/Display.template.php
+++ b/Themes/default/Display.template.php
@@ -148,7 +148,7 @@ function template_main()
 			// Show each option with its button - a radio likely.
 			foreach (Utils::$context['poll']['options'] as $option) {
 				echo '
-							<li>', $option['vote_button'], ' <label for="', $option['id'], '">', $option['option'], '</label></li>';
+							<li>', $option['vote_button'], ' <label for="options-', $option['id'], '">', $option['option'], '</label></li>';
 			}
 
 			echo '