diff --git a/phpBB/admin/admin_viewlogs.php b/phpBB/admin/admin_viewlogs.php
index 1bcd9a3596..2bb50a85d4 100644
--- a/phpBB/admin/admin_viewlogs.php
+++ b/phpBB/admin/admin_viewlogs.php
@@ -196,7 +196,7 @@ else
 {
 ?>
 	<tr>
-		<td class="row1" nowrap="nowrap"><?php echo $lang['No_entries']; ?></td>
+		<td class="row1" colspan="5" nowrap="nowrap"><?php echo $lang['No_entries']; ?></td>
 	</tr>
 <?php
 }
diff --git a/phpBB/admin/index.php b/phpBB/admin/index.php
index cfa9e85779..df10e1dea9 100644
--- a/phpBB/admin/index.php
+++ b/phpBB/admin/index.php
@@ -39,7 +39,7 @@ require('pagestart.' . $phpEx);
 //
 if ( !$acl->get_acl_admin() )
 {
-	message_die(MESSAGE, 'No_admin');
+	message_die(MESSAGE, 'No_admin', '', true);
 }
 
 //
diff --git a/phpBB/admin/pagestart.php b/phpBB/admin/pagestart.php
index 3addac5dd4..c834d78649 100644
--- a/phpBB/admin/pagestart.php
+++ b/phpBB/admin/pagestart.php
@@ -46,7 +46,7 @@ $session->configure($userdata);
 //
 function page_header($sub_title)
 {
-	global $db, $lang, $phpEx;
+	global $board_config, $db, $lang, $phpEx;
 
 	include('page_header_admin.'.$phpEx);
 
@@ -68,7 +68,7 @@ function page_header($sub_title)
 
 function page_footer($ignore_copyright = false)
 {
-	global $db, $lang, $phpEx;
+	global $board_config, $db, $lang, $phpEx;
 
 ?>
 
@@ -82,10 +82,12 @@ function page_footer($ignore_copyright = false)
 
 }
 
-function page_message($title, $message)
+function page_message($title, $message, $show_header)
 {
 	global $lang;
 
+	if ( $show_header )
+	{
 ?>
 
 <table width="100%" cellspacing="0" cellpadding="0" border="0">
@@ -95,6 +97,12 @@ function page_message($title, $message)
 	</tr>
 </table>
 
+<?php
+
+	}
+
+?>
+
 <br /><br />
 
 <table class="bg" width="80%" cellpadding="4" cellspacing="1" border="0" align="center">