diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5c12e1c..f75268f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@
 **Merged pull requests:**
 
 - Release v2.1.5-2023.10 🎉
-- Minor improvements [\#297](https://github.com/torrentpier/torrentpier-lts/pull/297), [\#298](https://github.com/torrentpier/torrentpier-lts/pull/298), [\#300](https://github.com/torrentpier/torrentpier-lts/pull/300), [\#301](https://github.com/torrentpier/torrentpier-lts/pull/301), [\#302](https://github.com/torrentpier/torrentpier-lts/pull/302), [\#303](https://github.com/torrentpier/torrentpier-lts/pull/303), [\#304](https://github.com/torrentpier/torrentpier-lts/pull/304) ([belomaxorka](https://github.com/belomaxorka))
+- Minor improvements [\#297](https://github.com/torrentpier/torrentpier-lts/pull/297), [\#298](https://github.com/torrentpier/torrentpier-lts/pull/298), [\#300](https://github.com/torrentpier/torrentpier-lts/pull/300), [\#301](https://github.com/torrentpier/torrentpier-lts/pull/301), [\#302](https://github.com/torrentpier/torrentpier-lts/pull/302), [\#303](https://github.com/torrentpier/torrentpier-lts/pull/303), [\#304](https://github.com/torrentpier/torrentpier-lts/pull/304), [\#305](https://github.com/torrentpier/torrentpier-lts/pull/305) ([belomaxorka](https://github.com/belomaxorka))
 
 ## [v2.1.5-2023.09](https://github.com/torrentpier/torrentpier-lts/tree/v2.1.5-2023.09) (2023-10-04)
 [Full Changelog](https://github.com/torrentpier/torrentpier-lts/compare/v2.1.5-2023.08-HotFix...v2.1.5-2023.09)
diff --git a/admin/admin_forum_prune.php b/admin/admin_forum_prune.php
index 86e8968e..6c4b908c 100644
--- a/admin/admin_forum_prune.php
+++ b/admin/admin_forum_prune.php
@@ -15,7 +15,7 @@ if (isset($_REQUEST['submit']))
 {
 	if (!$var =& $_REQUEST['f'] OR !$f_selected = get_id_ary($var))
 	{
-		bb_die('Forum not selected');
+		bb_die($lang['SELECT_FORUM']);
 	}
 	if (!$var =& $_REQUEST['prunedays'] OR !$prunedays = abs(intval($var)))
 	{
@@ -57,4 +57,4 @@ $template->assign_vars(array(
 	'SEL_FORUM'      => get_forum_select('admin', 'f[]', null, 65, 16, '', $all_forums),
 ));
 
-print_page('admin_forum_prune.tpl', 'admin');
\ No newline at end of file
+print_page('admin_forum_prune.tpl', 'admin');
diff --git a/admin/admin_words.php b/admin/admin_words.php
index e46de302..0ae55e51 100644
--- a/admin/admin_words.php
+++ b/admin/admin_words.php
@@ -49,7 +49,7 @@ if ($mode != '')
 			}
 			else
 			{
-				bb_die($lang['NO_WORD_SELECTED']);
+				bb_die($lang['NO_WORD_SELECTED'] . '<br /><br />' . sprintf($lang['CLICK_RETURN_WORDADMIN'], '<a href="admin_words.php">', '</a>') . '<br /><br />' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>'));
 			}
 		}
 
@@ -69,7 +69,7 @@ if ($mode != '')
 
 		if ($word == '' || $replacement == '')
 		{
-			bb_die($lang['MUST_ENTER_WORD']);
+			bb_die($lang['MUST_ENTER_WORD'] . '<br /><br />' . sprintf($lang['CLICK_RETURN_WORDADMIN'], '<a href="admin_words.php">', '</a>') . '<br /><br />' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>'));
 		}
 
 		if ($word_id)
@@ -115,7 +115,7 @@ if ($mode != '')
 		}
 		else
 		{
-			bb_die($lang['NO_WORD_SELECTED']);
+			bb_die($lang['NO_WORD_SELECTED'] . '<br /><br />' . sprintf($lang['CLICK_RETURN_WORDADMIN'], '<a href="admin_words.php">', '</a>') . '<br /><br />' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>'));
 		}
 	}
 }
@@ -154,4 +154,4 @@ else
 	}
 }
 
-print_page('admin_words.tpl', 'admin');
\ No newline at end of file
+print_page('admin_words.tpl', 'admin');
diff --git a/modcp.php b/modcp.php
index 0cfa30f0..d6244c30 100644
--- a/modcp.php
+++ b/modcp.php
@@ -140,7 +140,7 @@ elseif ($forum_id)
 
 	if (!$topic_row = DB()->fetch_row($sql))
 	{
-		bb_die('Forum not exist');
+		bb_die($lang['FORUM_NOT_EXIST']);
 	}
 
 	$forum_name = $topic_row['forum_name'];