diff --git a/phpBB/adm/admin_board.php b/phpBB/adm/admin_board.php
index fef4397cdb..670a65a3db 100644
--- a/phpBB/adm/admin_board.php
+++ b/phpBB/adm/admin_board.php
@@ -523,6 +523,10 @@ switch ($mode)
 
 	case 'load':
 
+		$load_db_track_yes = ($new['load_db_track']) ? 'checked="checked"' : '';
+		$load_db_track_no = (!$new['load_db_track']) ? 'checked="checked"' : '';
+		$load_db_lastread_yes = ($new['load_db_lastread']) ? 'checked="checked"' : '';
+		$load_db_lastread_no = (!$new['load_db_lastread']) ? 'checked="checked"' : '';
 		$load_online_yes = ($new['load_online']) ? 'checked="checked"' : '';
 		$load_online_no = (!$new['load_online']) ? 'checked="checked"' : '';
 		$moderators_yes = ($new['load_moderators']) ? 'checked="checked"' : '';
@@ -548,13 +552,21 @@ switch ($mode)
 		<td class="row2"><input type="text" size="4" maxlength="4" name="active_sessions" value="<?php echo $new['active_sessions']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['VIEW_ONLINE_TIME']; ?>: <br /><span class="gensmall"><?php echo $user->lang['VIEW_ONLINE_TIME_EXPLAIN']; ?></span></td>
-		<td class="row2"><input type="text" size="4" maxlength="3" name="load_online_time" value="<?php echo $new['load_online_time']; ?>" /></td>
+		<td class="row1"><?php echo $user->lang['YES_POST_MARKING']; ?>: <br /><span class="gensmall"><?php echo $user->lang['YES_POST_MARKING_EXPLAIN']; ?></span></td>
+		<td class="row2"><input type="radio" name="load_db_track" value="1"<?php echo $load_db_track_yes ?> /><?php echo $user->lang['YES'] ?>&nbsp; &nbsp;<input type="radio" name="load_db_track" value="0" <?php echo $load_db_track_no ?> /> <?php echo $user->lang['NO']; ?></td>
+	</tr>
+	<tr>
+		<td class="row1"><?php echo $user->lang['YES_READ_MARKING']; ?>: <br /><span class="gensmall"><?php echo $user->lang['YES_READ_MARKING_EXPLAIN']; ?></span></td>
+		<td class="row2"><input type="radio" name="load_db_lastread" value="1"<?php echo $load_db_lastread_yes ?> /><?php echo $user->lang['YES'] ?>&nbsp; &nbsp;<input type="radio" name="load_db_lastread" value="0" <?php echo $load_db_lastread_no ?> /> <?php echo $user->lang['NO']; ?></td>
 	</tr>
 	<tr>
 		<td class="row1"><?php echo $user->lang['YES_ONLINE']; ?>: <br /><span class="gensmall"><?php echo $user->lang['YES_ONLINE_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="radio" name="load_online" value="1"<?php echo $load_online_yes ?> /><?php echo $user->lang['YES'] ?>&nbsp; &nbsp;<input type="radio" name="load_online" value="0" <?php echo $load_online_no ?> /> <?php echo $user->lang['NO']; ?></td>
 	</tr>
+	<tr>
+		<td class="row1"><?php echo $user->lang['VIEW_ONLINE_TIME']; ?>: <br /><span class="gensmall"><?php echo $user->lang['VIEW_ONLINE_TIME_EXPLAIN']; ?></span></td>
+		<td class="row2"><input type="text" size="4" maxlength="3" name="load_online_time" value="<?php echo $new['load_online_time']; ?>" /></td>
+	</tr>
 	<tr>
 		<td class="row1"><?php echo $user->lang['YES_MODERATORS']; ?>: </td>
 		<td class="row2"><input type="radio" name="load_moderators" value="1"<?php echo $moderators_yes ?> /><?php echo $user->lang['YES'] ?>&nbsp; &nbsp;<input type="radio" name="load_moderators" value="0" <?php echo $moderators_no ?> /> <?php echo $user->lang['NO']; ?></td>
diff --git a/phpBB/install/schemas/mysql_basic.sql b/phpBB/install/schemas/mysql_basic.sql
index d3e10af4ba..865ab990ee 100644
--- a/phpBB/install/schemas/mysql_basic.sql
+++ b/phpBB/install/schemas/mysql_basic.sql
@@ -53,6 +53,8 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_moderators',
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_search', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_search_upd', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_search_phr', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_db_lastread', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_db_track', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_gc', '3600');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_gc', '7200');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_check', '4');
diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php
index d2748879af..b04e4af3ec 100644
--- a/phpBB/language/en/lang_admin.php
+++ b/phpBB/language/en/lang_admin.php
@@ -355,13 +355,14 @@ $lang = array_merge($lang, array(
 	'acl_u_viewonline'	=> 'Can view all online',
 	'acl_u_viewprofile'	=> 'Can view profiles',
 	'acl_u_sendemail'	=> 'Can send emails',
-	'acl_u_sendpm'		=> 'Can send messages',
-	'acl_u_readpm'		=> 'Can read messages',
+	'acl_u_sendpm'		=> 'Can send private messages',
+	'acl_u_readpm'		=> 'Can read private messages',
 	'acl_u_setavatar'	=> 'Can display avatar',
 	'acl_u_chgavatar'	=> 'Can change avatar',
 	'acl_u_chgcolor'	=> 'Can change default group',
 	'acl_u_chgemail'	=> 'Can change email address',
 	'acl_u_chgname'		=> 'Can change username',
+	'acl_u_chggrp'		=> 'Can change default usergroup',
 	'acl_u_chgpasswd'	=> 'Can change password',
 	'acl_u_search'		=> 'Can search board',
 
@@ -456,11 +457,15 @@ $lang = array_merge($lang, array(
 	'LIMIT_LOAD_EXPLAIN'		=> 'If the 1 minute system load exceeds this value the board will go offline, 1.0 equals ~100% utilisation of one processor. This only functions on UNIX based servers.',
 	'LIMIT_SESSIONS'			=> 'Limit sessions',
 	'LIMIT_SESSIONS_EXPLAIN'	=> 'If the number of sessions exceeds this value within a one minute period the board will go offline. Set to 0 for unlimited sessions.',
-	'SESSION_LENGTH'			=> 'Session length [ seconds ]',
+	'SESSION_LENGTH'			=> 'Session length [ seconds ]', 
+	'YES_POST_MARKING'			=> 'Enable dotted topics', 
+	'YES_POST_MARKING_EXPLAIN'	=> 'Indicates whether user has posted to a topic.', 
+	'YES_READ_MARKING'			=> 'Enable server-side topic marking', 
+	'YES_READ_MARKING_EXPLAIN'	=> 'Stores read/unread status information in the database rather than a cookie.', 
 	'VIEW_ONLINE_TIME'			=> 'View online time span [ minutes ]', 
 	'VIEW_ONLINE_TIME_EXPLAIN'	=> 'How long before users drop out of the viewonline listings, lower equals less processing.', 
-	'YES_ONLINE'				=> 'Enable pagewise online list', 
-	'YES_ONLINE_EXPLAIN'		=> 'Display users browsing on index, forum and topic pages.', 
+	'YES_ONLINE'				=> 'Enable online user listings', 
+	'YES_ONLINE_EXPLAIN'		=> 'Display online user information on index, forum and topic pages.', 
 	'YES_MODERATORS'			=> 'Enable display of Moderators', 
 	'YES_SEARCH'				=> 'Enable search facilities', 
 	'YES_SEARCH_EXPLAIN'		=> 'User and backend search functions including fulltext updates when posting.',