diff --git a/system/pages/news.php b/system/pages/news.php
index 0262163e..dc8c700e 100644
--- a/system/pages/news.php
+++ b/system/pages/news.php
@@ -88,7 +88,7 @@ if(isset($_GET['archive']))
 	foreach($news_DB as $news)
 	{
 		$newses[] = array(
-			'link' => getLink('news') . '/' . $news['id'],
+			'link' => getLink('news/archive') . '/' . $news['id'],
 			'icon_id' => $categories[$news['category']]['icon_id'],
 			'title' => stripslashes($news['title']),
 			'date' => $news['date']
diff --git a/templates/tibiacom/index.php b/templates/tibiacom/index.php
index c19b1d12..7ab60357 100644
--- a/templates/tibiacom/index.php
+++ b/templates/tibiacom/index.php
@@ -35,6 +35,16 @@ if(isset($config['boxes']))
 				}
 				else {
 					$tmp = str_replace('/', '_', PAGE);
+					$exp = explode('/', PAGE);
+					if(PAGE !== 'account/create' && PAGE !== 'account/lost' && isset($exp[1])) {
+						if ($exp[0] === 'account') {
+							$tmp = 'account_manage';
+						} else if ($exp[0] === 'news' && $exp[1] === 'archive') {
+							$tmp = 'news_archive';
+						}
+						else
+							$tmp = $exp[0];
+					}
 				}
 			}
 			else {