diff --git a/library/config.php b/library/config.php
index 170100086..24a8af843 100644
--- a/library/config.php
+++ b/library/config.php
@@ -473,7 +473,7 @@ $bb_cfg['show_rank_image'] = true; // Show user rank image in topics
 $bb_cfg['show_poster_joined'] = true; // Show user's registration date in topics
 $bb_cfg['show_poster_posts'] = true; // Show user's post count in topics
 $bb_cfg['show_poster_from'] = true; // Show user's country in topics
-$bb_cfg['show_bot_nick'] = false; // Show bot's nickname
+$bb_cfg['show_bot_nick'] = true; // Show bot's nickname
 $bb_cfg['text_buttons'] = false; // replace EDIT, QUOTE... images with text links
 $bb_cfg['post_date_format'] = 'd-M-Y H:i'; // Date format for topics
 $bb_cfg['ext_link_new_win'] = true; // open external links in new window
diff --git a/styles/templates/default/viewtopic.tpl b/styles/templates/default/viewtopic.tpl
index 10e6305c4..fd52271cd 100644
--- a/styles/templates/default/viewtopic.tpl
+++ b/styles/templates/default/viewtopic.tpl
@@ -218,7 +218,7 @@ function build_poll_add_form (src_el)
 		<div class="med" style="margin-top: 4px;">{L_NEW_POLL_M_VOTES}:</div>
 		<textarea id="poll-votes-inp" rows="8" cols="10" wrap="off" class="gen" style="width: 550px;"></textarea>
 		<div class="med mrg_4"><i>{L_NEW_POLL_M_EXPLAIN}: {$bb_cfg['max_poll_options']})</i></div>
-		<div class="mrg_8 tCenter"><input id="poll-edit-submit-btn" type="button" value="{L_SUBMIT}" class="bold" style="width: 100px;" /></div>
+		<div class="mrg_8 tCenter"><input onclick="window.location.reload();" type="button" class="bold" value="{L_CANCEL}" />&nbsp;&nbsp;<input id="poll-edit-submit-btn" type="button" value="{L_SUBMIT}" class="bold" style="width: 100px;" /></div>
 	</fieldset>
 	</td></tr></table>
 </div>
diff --git a/styles/templates/default/viewtopic_poll.tpl b/styles/templates/default/viewtopic_poll.tpl
index 13d2e8773..a6d639954 100644
--- a/styles/templates/default/viewtopic_poll.tpl
+++ b/styles/templates/default/viewtopic_poll.tpl
@@ -128,7 +128,7 @@ function html2text (str)
 
 <!-- IF not POLL_ALREADY_VOTED && SHOW_VOTE_BTN -->
 <div id="vote-btn-a" class="mrg_8 tCenter">[ <a href="#" onclick="build_votes(); return false;" class="gen"><b>{L_SUBMIT_VOTE}</b></a> ]</div>
-<div id="vote-btn-input" class="mrg_6 tCenter" style="display: none;"><input type="button" onclick="submit_vote(); return false;" value="{L_SUBMIT_VOTE}" class="bold" /></div>
+<div id="vote-btn-input" class="mrg_6 tCenter" style="display: none;"><input onclick="window.location.reload();" type="button" class="bold" value="{L_CANCEL}" />&nbsp;&nbsp;<input type="button" onclick="submit_vote(); return false;" value="{L_SUBMIT_VOTE}" class="bold" /></div>
 <!-- ELSEIF not SHOW_VOTE_BTN -->
 <div class="mrg_8 tCenter">[ <b>{L_NEW_POLL_END}</b> ]</div>
 <!-- ENDIF -->