diff --git a/phpBB/admin/admin_search.php b/phpBB/admin/admin_search.php
index 5ca5f871ad..f33a774572 100644
--- a/phpBB/admin/admin_search.php
+++ b/phpBB/admin/admin_search.php
@@ -27,7 +27,7 @@ if ( !empty($setmodules) )
 	}
 
 	$filename = basename(__FILE__);
-	$module['DB']['Search_indexing'] = $filename;
+	$module['DB']['Search_indexing'] = $filename . $SID;
 
 	return;
 }
@@ -273,7 +273,16 @@ if ( isset($HTTP_POST_VARS['start']) || isset($HTTP_GET_VARS['batchstart']) )
 
 		page_header($lang['DB']);
 
+?>
+
+<h1><?php echo $lang['Search_indexing']; ?></h1>
+
+<p><?php echo $lang['Search_indexing_complete']; ?></p>
+
+<?php
+
 		page_footer();
+
 	}
 
 	exit;
@@ -281,7 +290,17 @@ if ( isset($HTTP_POST_VARS['start']) || isset($HTTP_GET_VARS['batchstart']) )
 }
 else if ( isset($HTTP_POST_VARS['cancel']) )
 {
+	page_header($lang['DB']);
 
+?>
+
+<h1><?php echo $lang['Search_indexing']; ?></h1>
+
+<p><?php echo $lang['Search_indexing_cancel']; ?></p>
+
+<?php
+
+	page_footer();
 
 }
 else
diff --git a/phpBB/admin/index.php b/phpBB/admin/index.php
index df10e1dea9..74d3ad829a 100644
--- a/phpBB/admin/index.php
+++ b/phpBB/admin/index.php
@@ -53,7 +53,7 @@ if ( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'top' )
 
 <table width="100%" cellspacing="0" cellpadding="0" border="0">
 	<tr>
-		<td><a href="index.<?php echo $phpEx; ?>?pane=right" target="main"><img src="images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td>
+		<td><a href="index.<?php echo $phpEx . $SID; ?>&amp;pane=right" target="main"><img src="images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td>
 		<td width="100%" background="images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle"><?php echo $lang['Admin_title']; ?></span> &nbsp; &nbsp; &nbsp;</td>
 	</tr>
 </table>
@@ -98,10 +98,10 @@ else if ( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'left' )
 				<th class="menu" height="25">&#0187; <?php echo $lang['Return_to']; ?></th>
 			</tr>
 			<tr>
-				<td class="row1"><a class="genmed" href="index.<?php echo $phpEx; ?>?pane=right" target="main"><?php echo $lang['Admin_Index']; ?></a></td>
+				<td class="row1"><a class="genmed" href="index.<?php echo $phpEx . $SID; ?>&amp;pane=right" target="main"><?php echo $lang['Admin_Index']; ?></a></td>
 			</tr>
 			<tr>
-				<td class="row2"><a class="genmed" href="../" target="_top"><?php echo $lang['Forum_index']; ?></a></td>
+				<td class="row2"><a class="genmed" href="../index.<?php echo $phpEx . $SID; ?>" target="_top"><?php echo $lang['Forum_index']; ?></a></td>
 			</tr>
 <?php
 
diff --git a/phpBB/admin/pagestart.php b/phpBB/admin/pagestart.php
index c834d78649..b187a90294 100644
--- a/phpBB/admin/pagestart.php
+++ b/phpBB/admin/pagestart.php
@@ -84,7 +84,7 @@ function page_footer($ignore_copyright = false)
 
 function page_message($title, $message, $show_header)
 {
-	global $lang;
+	global $phpEx, $SID, $lang;
 
 	if ( $show_header )
 	{
@@ -92,7 +92,7 @@ function page_message($title, $message, $show_header)
 
 <table width="100%" cellspacing="0" cellpadding="0" border="0">
 	<tr>
-		<td><a href="../"><img src="images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td>
+		<td><a href="../index.<?php echo $phpEx . $SID; ?>"><img src="images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td>
 		<td width="100%" background="images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle"><?php echo $lang['Admin_title']; ?></span> &nbsp; &nbsp; &nbsp;</td>
 	</tr>
 </table>
diff --git a/phpBB/language/lang_english/lang_admin.php b/phpBB/language/lang_english/lang_admin.php
index 1d8d10da92..60b5a53218 100644
--- a/phpBB/language/lang_english/lang_admin.php
+++ b/phpBB/language/lang_english/lang_admin.php
@@ -751,14 +751,13 @@ $lang['Install_No_PCRE'] = 'phpBB2 requires the Perl-Compatible Regular Expressi
 // Search re-indexing
 //
 $lang['Search_indexing'] = 'Search Indexing';
-$lang['Search_indexing_explain'] = 'phpBB2 uses a fulltext search system. This breaks down each post into seperate words and then, if the word does not already exist it stores those words in a table. In turn the post is linked to each word it contains in this table. This allows quick searching of large databases and helps reduce load on the server compared to most other methods.</p><p>However, if the tables get out of sync for some reason or you change the minimum, maximum or disallowed list of words the tables need updating. This facility allows you to do just that.</p><p>Please be aware this procedure can take a long time, particularly on large databases. During this period your forum will be automatically shut down to prevent people posting. You can cancel the procedure at any time.</p>';
+$lang['Search_indexing_explain'] = 'phpBB2 uses a fulltext search system. This breaks down each post into seperate words and then, if the word does not already exist it stores those words in a table. In turn the post is linked to each word it contains in this table. This allows quick searching of large databases and helps reduce load on the server compared to most other methods.</p><p>However, if the tables get out of sync for some reason or you change the minimum, maximum or disallowed list of words the tables need updating. This facility allows you to do just that.</p><p>Please be aware this procedure can take a long time, particularly on large databases. During this period your forum will be automatically shut down to prevent people posting. You can cancel the procedure at any time. Please remember this is an intensive operation and should only be carried out when absolutely necessarily. Do not run this script too often!</p>';
+$lang['Search_indexing_cancel'] = 'Re-indexing of search system has been cancelled. Please note this will result in searches returning incomplete results. You can re-index the posts again at any stage.';
+$lang['Search_indexing_complete'] = 'Re-indexing of search system has been completed. You can re-index the posts again at any stage.';
 
 $lang['Start'] = 'Start';
 $lang['Stop'] = 'Stop';
 
-$lang['Indexing_stop_explain'] = 'Search re-indexing has been stopped. Please note that because you stopped the procedure before it completed some posts will now not appear when words they contain are searched for.';
-$lang['Indexing_finished_explain'] = 'Search re-indexing has been completed successfully.';
-
 //
 // That's all Folks!
 // -------------------------------------------------