diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f293677..eb84b3dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,7 @@
 - Fixed issue with atom feed [\#147](https://github.com/torrentpier/torrentpier-lts/pull/147) ([belomaxorka](https://github.com/belomaxorka))
 - Added theme exists check [\#149](https://github.com/torrentpier/torrentpier-lts/pull/149) ([belomaxorka](https://github.com/belomaxorka))
 - Use XS_TPL_PREFIX instread of 'tpl_' [\#150](https://github.com/torrentpier/torrentpier-lts/pull/150) ([belomaxorka](https://github.com/belomaxorka))
-- Use constants instead of string literals [\#151](https://github.com/torrentpier/torrentpier-lts/pull/151) ([belomaxorka](https://github.com/belomaxorka))
+- Use constants instead of string literals [\#151](https://github.com/torrentpier/torrentpier-lts/pull/151), [\#160](https://github.com/torrentpier/torrentpier-lts/pull/160) ([belomaxorka](https://github.com/belomaxorka))
 - Sync language (html dir) with latest sources [\#152](https://github.com/torrentpier/torrentpier-lts/pull/152) ([belomaxorka](https://github.com/belomaxorka))
 - Updated UK lang icons [\#155](https://github.com/torrentpier/torrentpier-lts/pull/155) ([belomaxorka](https://github.com/belomaxorka))
 - Minor fixes [\#124](https://github.com/torrentpier/torrentpier-lts/pull/124), [\#133](https://github.com/torrentpier/torrentpier-lts/pull/133), [\#135](https://github.com/torrentpier/torrentpier-lts/pull/135), [\#136](https://github.com/torrentpier/torrentpier-lts/pull/136), [\#139](https://github.com/torrentpier/torrentpier-lts/pull/139), [\#142](https://github.com/torrentpier/torrentpier-lts/pull/142), [\#144](https://github.com/torrentpier/torrentpier-lts/pull/144), [\#145](https://github.com/torrentpier/torrentpier-lts/pull/145), [\#148](https://github.com/torrentpier/torrentpier-lts/pull/148), [\#153](https://github.com/torrentpier/torrentpier-lts/pull/153), [\#154](https://github.com/torrentpier/torrentpier-lts/pull/154), [\#156](https://github.com/torrentpier/torrentpier-lts/pull/156), [\#157](https://github.com/torrentpier/torrentpier-lts/pull/157), [\#158](https://github.com/torrentpier/torrentpier-lts/pull/158), [\#159](https://github.com/torrentpier/torrentpier-lts/pull/159) ([belomaxorka](https://github.com/belomaxorka))
diff --git a/admin/admin_forums.php b/admin/admin_forums.php
index eb2c56ae..1c9dbe7a 100644
--- a/admin/admin_forums.php
+++ b/admin/admin_forums.php
@@ -806,7 +806,7 @@ if (!$mode || $show_main_page)
 						'SF_PAD'            => ($forum_rows[$j]['forum_parent']) ? ' style="padding-left: 20px;" ' : '',
 						'FORUM_NAME_CLASS'  => ($forum_rows[$j]['forum_parent']) ? 'genmed' : 'gen',
 						'ADD_SUB_HREF'      => "admin_forums.php?mode=addforum&forum_parent={$forum_rows[$j]['forum_id']}",
-						'U_VIEWFORUM'       => BB_ROOT ."viewforum.php?f=$forum_id",
+						'U_VIEWFORUM'       => BB_ROOT . FORUM_URL . $forum_id,
 						'U_FORUM_EDIT'      => "admin_forums.php?mode=editforum&f=$forum_id",
 						'U_FORUM_PERM'      => "admin_forumauth.php?f=$forum_id",
 						'U_FORUM_DELETE'    => "admin_forums.php?mode=deleteforum&f=$forum_id",
diff --git a/viewforum.php b/viewforum.php
index afb77202..b5871ae5 100644
--- a/viewforum.php
+++ b/viewforum.php
@@ -404,7 +404,7 @@ else
 $template->assign_vars(array(
 	'U_POST_NEW_TOPIC'    => $post_new_topic_url,
 	'S_SELECT_TOPIC_DAYS' => build_select('topicdays', array_flip($sel_previous_days), $topic_days),
-	'S_POST_DAYS_ACTION'  => "viewforum.php?f=$forum_id&start=$start",
+	'S_POST_DAYS_ACTION'  => FORUM_URL . "$forum_id&start=$start",
 	'S_DISPLAY_ORDER'     => $s_display_order,
 ));