diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 4d47a6be41..d403b7bd28 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -78,10 +78,11 @@
 
 		<div class="content">
 
-	<a name="v30rc6"></a><h3>1.i. Changes since 3.0.RC7</h3>
+	<a name="v30rc7"></a><h3>1.i. Changes since 3.0.RC7</h3>
 
 	<ul>
 		<li>[Fix] Fixed MSSQL related bug in the update system</li>
+		<li>[Fix] Display &quot;Return to&quot; links on unwritable forums (Bug #14824)</li>
 	</ul>
 
 	<a name="v30rc6"></a><h3>1.i. Changes since 3.0.RC6</h3>
diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html
index 323668628d..cf98701c78 100644
--- a/phpBB/styles/prosilver/template/jumpbox.html
+++ b/phpBB/styles/prosilver/template/jumpbox.html
@@ -2,9 +2,9 @@
 <!-- IF S_DISPLAY_JUMPBOX -->
 	<form method="post" id="jumpbox" action="{S_JUMPBOX_ACTION}" onsubmit="if(document.jumpbox.f.value == -1){return false;}">
 
-	<!-- IF U_POST_REPLY_TOPIC -->
+	<!-- IF S_VIEWTOPIC -->
 		<p><a href="{U_VIEW_FORUM}" class="left-box {S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO} {FORUM_NAME}</a></p>
-	<!-- ELSEIF U_POST_NEW_TOPIC -->
+	<!-- ELSEIF S_VIEWFORUM -->
 		<p><a href="{U_INDEX}" class="left-box {S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO} {L_INDEX}</a></p>
 	<!-- ELSEIF SEARCH_TOPIC -->
 		<p><a class="left-box {S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}" accesskey="r">{L_RETURN_TO}: {SEARCH_TOPIC}</a></p>
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 46a5ccf5e7..c7888505cd 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -627,6 +627,7 @@ if (sizeof($topic_list))
 			'S_POST_STICKY'			=> ($row['topic_type'] == POST_STICKY) ? true : false,
 			'S_TOPIC_LOCKED'		=> ($row['topic_status'] == ITEM_LOCKED) ? true : false,
 			'S_TOPIC_MOVED'			=> ($row['topic_status'] == ITEM_MOVED) ? true : false,
+			'S_VIEWFORUM'			=> true,
 
 			'U_NEWEST_POST'			=> $view_topic_url . '&amp;view=unread#unread',
 			'U_LAST_POST'			=> $view_topic_url . '&amp;p=' . $row['topic_last_post_id'] . '#p' . $row['topic_last_post_id'],
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 9d2a6b61c0..32b35a2060 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1425,6 +1425,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 		'S_FIRST_UNREAD'	=> $s_first_unread,
 		'S_CUSTOM_FIELDS'	=> (isset($cp_row['row']) && sizeof($cp_row['row'])) ? true : false,
 		'S_TOPIC_POSTER'	=> ($topic_data['topic_poster'] == $poster_id) ? true : false,
+		'S_VIEWTOPIC'		=> true,
 
 		'S_IGNORE_POST'		=> ($row['hide_post']) ? true : false,
 		'L_IGNORE_POST'		=> ($row['hide_post']) ? sprintf($user->lang['POST_BY_FOE'], get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), '<a href="' . $viewtopic_url . "&amp;p={$row['post_id']}&amp;view=show#p{$row['post_id']}" . '">', '</a>') : '',