diff --git a/phpBB/admin/admin_words.php b/phpBB/admin/admin_words.php
index 409f583dfc..2967fb14ca 100644
--- a/phpBB/admin/admin_words.php
+++ b/phpBB/admin/admin_words.php
@@ -107,8 +107,8 @@ if( $mode != "" )
 		}
 
 		$template->assign_vars(array(
-			"WORD" => $word_info['word'],
-			"REPLACEMENT" => $word_info['replacement'],
+			"WORD" => htmlspecialchars($word_info['word']),
+			"REPLACEMENT" => htmlspecialchars($word_info['replacement']),
 
 			"L_WORDS_TITLE" => $lang['Words_title'],
 			"L_WORDS_TEXT" => $lang['Words_explain'],
@@ -257,8 +257,8 @@ else
 		$template->assign_block_vars("words", array(
 			"ROW_COLOR" => "#" . $row_color,
 			"ROW_CLASS" => $row_class,
-			"WORD" => $word,
-			"REPLACEMENT" => $replacement,
+			"WORD" => htmlspecialchars($word),
+			"REPLACEMENT" => htmlspecialchars($replacement),
 
 			"U_WORD_EDIT" => append_sid("admin_words.$phpEx?mode=edit&id=$word_id"),
 			"U_WORD_DELETE" => append_sid("admin_words.$phpEx?mode=delete&id=$word_id"))
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 428d8c6515..668671d4da 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -77,8 +77,8 @@ p,ul,td {font-size:10pt;}
 <li>[Fix] Selected field on first entry by default for font size within posting_body.tpl (Bug #7124)</li>
 <li>[Fix] Adjusted maxlength parameters in admin/styles_edit_body.tpl (Bug #81)</li>
 <li>[Fix] Fixed html output in make_forum_select if no forums present (Bug #436)</li>
-
 <li>[Fix] Fixed spelling error(s) in lang_admin.php (Bug #7172, #6978)</li>
+<li>[Fix] Correctly display censored words in admin panel (Bug #12271)</li>
 </ul>
 
 <a name="2021"></a><h3 class="h3">l.ii. Changes since 2.0.21</h3>