diff --git a/CHANGELOG.md b/CHANGELOG.md
index 320292b65..d049d82cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - Fixed issue with poll_users cleaning at every cron job startup [\#1390](https://github.com/torrentpier/torrentpier/pull/1390) ([belomaxorka](https://github.com/belomaxorka))
 - Fixed Undefined variable $wordCensor [\#1400](https://github.com/torrentpier/torrentpier/pull/1400) ([belomaxorka](https://github.com/belomaxorka))
 - Improved word censor 🤐 [\#1393](https://github.com/torrentpier/torrentpier/pull/1393) ([belomaxorka](https://github.com/belomaxorka))
+- Show poll prefix for guests [\#1417](https://github.com/torrentpier/torrentpier/pull/1417) ([belomaxorka](https://github.com/belomaxorka))
 - Used hashing for filenames generation [\#1385](https://github.com/torrentpier/torrentpier/pull/1385) ([belomaxorka](https://github.com/belomaxorka))
 - Hide quote button if topic locked [\#1416](https://github.com/torrentpier/torrentpier/pull/1416) ([belomaxorka](https://github.com/belomaxorka))
 - Minor improvements [\#1382](https://github.com/torrentpier/torrentpier/pull/1382), [\#1383](https://github.com/torrentpier/torrentpier/pull/1383), [\#1391](https://github.com/torrentpier/torrentpier/pull/1391), [\#1398](https://github.com/torrentpier/torrentpier/pull/1398), [\#1405](https://github.com/torrentpier/torrentpier/pull/1405), [\#1406](https://github.com/torrentpier/torrentpier/pull/1406), [\#1408](https://github.com/torrentpier/torrentpier/pull/1408), [\#1409](https://github.com/torrentpier/torrentpier/pull/1409), [\#1410](https://github.com/torrentpier/torrentpier/pull/1410), [\#1411](https://github.com/torrentpier/torrentpier/pull/1411) ([belomaxorka](https://github.com/belomaxorka))
diff --git a/search.php b/search.php
index b20fe31ca..d3e8c9ed6 100644
--- a/search.php
+++ b/search.php
@@ -796,7 +796,7 @@ else {
             'STATUS' => $topic['topic_status'],
             'TYPE' => $topic['topic_type'],
             'DL' => ($topic['topic_dl_type'] == TOPIC_DL_TYPE_DL),
-            'POLL' => !IS_GUEST && $topic['topic_vote'],
+            'POLL' => (bool)$topic['topic_vote'],
             'DL_CLASS' => isset($topic['dl_status']) ? $dl_link_css[$topic['dl_status']] : '',
 
             'TOPIC_AUTHOR' => profile_url(array('username' => $topic['first_username'], 'user_id' => $topic['first_user_id'], 'user_rank' => $topic['first_user_rank'])),
diff --git a/viewforum.php b/viewforum.php
index 0841a8ccf..e34a30799 100644
--- a/viewforum.php
+++ b/viewforum.php
@@ -458,7 +458,7 @@ foreach ($topic_rowset as $topic) {
         'STATUS' => $topic['topic_status'],
         'TYPE' => $topic['topic_type'],
         'DL' => ($topic['topic_dl_type'] == TOPIC_DL_TYPE_DL && !$forum_data['allow_reg_tracker']),
-        'POLL' => !IS_GUEST && $topic['topic_vote'],
+        'POLL' => (bool)$topic['topic_vote'],
         'DL_CLASS' => isset($topic['dl_status']) ? $dl_link_css[$topic['dl_status']] : '',
 
         'TOPIC_AUTHOR' => profile_url(['username' => str_short($topic['first_username'], 15), 'user_id' => $topic['first_user_id'], 'user_rank' => $topic['first_user_rank']]),
diff --git a/viewtopic.php b/viewtopic.php
index ddd9b630f..cebfdd6c7 100644
--- a/viewtopic.php
+++ b/viewtopic.php
@@ -508,7 +508,7 @@ $template->assign_vars([
     'U_SEARCH_SELF' => "search.php?uid={$userdata['user_id']}&t=$topic_id&dm=1",
 
     'TOPIC_HAS_POLL' => $topic_has_poll,
-    'POLL_IS_EDITABLE' => (!$poll_time_expired),
+    'POLL_IS_EDITABLE' => !$poll_time_expired,
     'POLL_IS_FINISHED' => ($t_data['topic_vote'] == POLL_FINISHED),
     'CAN_MANAGE_POLL' => $can_manage_poll,
     'CAN_ADD_POLL' => $can_add_poll