diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 73e3f65f1c..8bb1954a5c 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -321,17 +321,6 @@
 	</table>
 <!-- ENDIF -->
 
-	<form id="forums" method="post" action="{U_ACTION}">
-
-	<fieldset class="quick" style="float: left;">
-		<input type="hidden" name="action" value="add" />
-
-		<input type="text" name="forum_name" /> 
-		<input class="button2" name="addforum" type="submit" value="{L_CREATE_FORUM}" />
-	</fieldset>
-
-	</form>
-
 	<form id="fselect" method="post" action="{U_SEL_ACTION}">
 
 	<fieldset class="quick">
@@ -342,6 +331,17 @@
 	
 	</form>
 
+	<form id="forums" method="post" action="{U_ACTION}">
+
+	<fieldset class="quick">
+		<input type="hidden" name="action" value="add" />
+
+		<input type="text" name="forum_name" value="" /> 
+		<input class="button2" name="addforum" type="submit" value="{L_CREATE_FORUM}" />
+	</fieldset>
+
+	</form>
+
 <!-- ENDIF -->
 
 <!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 75fc125920..c65866eba1 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -556,7 +556,7 @@ class acp_groups
 
 							'USERNAME'			=> $row['username'],
 							'S_GROUP_DEFAULT'	=> ($row['group_id'] == $group_id) ? true : false,
-							'JOINED'			=> ($row['user_regdate']) ? $user->format_date($row['user_regdate'], $user->lang['DATE_FORMAT']) : '-',
+							'JOINED'			=> ($row['user_regdate']) ? $user->format_date($row['user_regdate']) : ' - ',
 							'USER_POSTS'		=> $row['user_posts'],
 							'USER_ID'			=> $row['user_id'])
 						);
@@ -581,7 +581,7 @@ class acp_groups
 
 						'USERNAME'			=> $row['username'],
 						'S_GROUP_DEFAULT'	=> ($row['group_id'] == $group_id) ? true : false,
-						'JOINED'			=> ($row['user_regdate']) ? $user->format_date($row['user_regdate'], $user->lang['DATE_FORMAT']) : '-',
+						'JOINED'			=> ($row['user_regdate']) ? $user->format_date($row['user_regdate']) : ' - ',
 						'USER_POSTS'		=> $row['user_posts'],
 						'USER_ID'			=> $row['user_id'])
 					);
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index cd692c22de..a753e124f1 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -56,6 +56,22 @@ class acp_main
 						{
 							user_active_flip($user_id, USER_INACTIVE);
 						}
+
+						set_config('num_users', $config['num_users'] + sizeof($mark_ary), true);
+
+						// Get latest username
+						$sql = 'SELECT user_id, username
+							FROM ' . USERS_TABLE . '
+							WHERE user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')
+							ORDER BY user_id DESC';
+						$result = $db->sql_query_limit($sql, 1);
+
+						if ($row = $db->sql_fetchrow($result))
+						{
+							set_config('newest_user_id', $row['user_id']);
+							set_config('newest_username', $row['username']);
+						}
+						$db->freeresult($result);
 					}
 					else if ($action == 'delete')
 					{
@@ -72,11 +88,6 @@ class acp_main
 						add_log('admin', 'LOG_INDEX_' . strtoupper($action), implode(', ', $user_affected));
 					}
 
-					if ($action != 'delete')
-					{
-						set_config('num_users', $config['num_users'] + $db->sql_affectedrows(), true);
-					}
-
 				break;
 
 				case 'remind':
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index f72c6d3310..f66f6f8fcf 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -734,7 +734,7 @@ class acp_users
 					'USER'				=> $user_row['username'],
 					'USER_REGISTERED'	=> $user->format_date($user_row['user_regdate']),
 					'REGISTERED_IP'		=> ($ip == 'hostname') ? gethostbyaddr($user_row['user_ip']) : $user_row['user_ip'],
-					'USER_LASTACTIVE'	=> $user->format_date($user_row['user_lastvisit']),
+					'USER_LASTACTIVE'	=> ($user_row['user_lastvisit']) ? $user->format_date($user_row['user_lastvisit']) : ' - ',
 					'USER_EMAIL'		=> $user_row['user_email'],
 					'USER_WARNINGS'		=> $user_row['user_warnings'],
 					)
diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php
index 992b100bbc..2e0383c055 100755
--- a/phpBB/includes/mcp/mcp_notes.php
+++ b/phpBB/includes/mcp/mcp_notes.php
@@ -226,7 +226,7 @@ function mcp_notes_user_view($id, $mode, $action)
 		'USERNAME'			=> $userrow['username'],
 		'USER_COLOR'		=> (!empty($userrow['user_colour'])) ? $userrow['user_colour'] : '',
 		'RANK_TITLE'		=> $rank_title,
-		'JOINED'			=> $user->format_date($userrow['user_regdate'], $user->lang['DATE_FORMAT']),
+		'JOINED'			=> $user->format_date($userrow['user_regdate']),
 		'POSTS'				=> ($userrow['user_posts']) ? $userrow['user_posts'] : 0,
 		'WARNINGS'			=> ($userrow['user_warnings']) ? $userrow['user_warnings'] : 0,
 
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index 98fa890dd3..0c6d4e5d12 100755
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -306,7 +306,7 @@ function mcp_warn_post_view($id, $mode, $action)
 		'USERNAME'			=> $userrow['username'],
 		'USER_COLOR'		=> (!empty($userrow['user_colour'])) ? $userrow['user_colour'] : '',
 		'RANK_TITLE'		=> $rank_title,
-		'JOINED'			=> $user->format_date($userrow['user_regdate'], $user->lang['DATE_FORMAT']),
+		'JOINED'			=> $user->format_date($userrow['user_regdate']),
 		'POSTS'				=> ($userrow['user_posts']) ? $userrow['user_posts'] : 0,
 
 		'AVATAR_IMG'		=> $avatar_img,
@@ -350,7 +350,7 @@ function mcp_warn_user_view($id, $mode, $action)
 		'USERNAME'			=> $userrow['username'],
 		'USER_COLOR'		=> (!empty($userrow['user_colour'])) ? $userrow['user_colour'] : '',
 		'RANK_TITLE'		=> $userrow['rank_title'],
-		'JOINED'			=> $user->format_date($userrow['user_regdate'], $user->lang['DATE_FORMAT']),
+		'JOINED'			=> $user->format_date($userrow['user_regdate']),
 		'POSTS'				=> ($userrow['user_posts']) ? $userrow['user_posts'] : 0,
 		'WARNINGS'			=> ($userrow['user_warnings']) ? $userrow['user_warnings'] : 0,
 
diff --git a/phpBB/includes/ucp/ucp_attachments.php b/phpBB/includes/ucp/ucp_attachments.php
index 3c3b9c24ad..cc069e9270 100644
--- a/phpBB/includes/ucp/ucp_attachments.php
+++ b/phpBB/includes/ucp/ucp_attachments.php
@@ -117,7 +117,7 @@ class ucp_attachments
 					'EXTENSION'			=> $row['extension'],
 					'SIZE'				=> ($row['filesize'] >= 1048576) ? ($row['filesize'] >> 20) . ' ' . $user->lang['MB'] : (($row['filesize'] >= 1024) ? ($row['filesize'] >> 10) . ' ' . $user->lang['KB'] : $row['filesize'] . ' ' . $user->lang['BYTES']),
 					'DOWNLOAD_COUNT'	=> $row['download_count'],
-					'POST_TIME'			=> $user->format_date($row['filetime'], $user->lang['DATE_FORMAT']),
+					'POST_TIME'			=> $user->format_date($row['filetime']),
 					'TOPIC_TITLE'		=> ($row['in_message']) ? $row['message_title'] : $row['topic_title'],
 
 					'ATTACH_ID'			=> $row['attach_id'],
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 43e4ee1603..3cd898e772 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -655,7 +655,7 @@ class ucp_groups
 								'USERNAME'			=> $row['username'],
 								'U_USER_VIEW'		=> "memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u={$row['user_id']}",
 								'S_GROUP_DEFAULT'	=> ($row['group_id'] == $group_id) ? true : false,
-								'JOINED'			=> ($row['user_regdate']) ? $user->format_date($row['user_regdate'], $user->lang['DATE_FORMAT']) : '-',
+								'JOINED'			=> ($row['user_regdate']) ? $user->format_date($row['user_regdate']) : ' - ',
 								'USER_POSTS'		=> $row['user_posts'],
 								'USER_ID'			=> $row['user_id'])
 							);
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php
index f992d22a15..8f5cc6507d 100644
--- a/phpBB/includes/ucp/ucp_main.php
+++ b/phpBB/includes/ucp/ucp_main.php
@@ -156,8 +156,8 @@ class ucp_main
 
 				$template->assign_vars(array(
 					'USER_COLOR'		=> (!empty($user->data['user_colour'])) ? $user->data['user_colour'] : '', 
-					'JOINED'			=> $user->format_date($user->data['user_regdate'], $user->lang['DATE_FORMAT']),
-					'VISITED'			=> (empty($last_visit)) ? ' - ' : $user->format_date($last_visit, $user->lang['DATE_FORMAT']),
+					'JOINED'			=> $user->format_date($user->data['user_regdate']),
+					'VISITED'			=> (empty($last_visit)) ? ' - ' : $user->format_date($last_visit),
 					'WARNINGS'			=> ($user->data['user_warnings']) ? $user->data['user_warnings'] : 0,
 					'POSTS'				=> ($user->data['user_posts']) ? $user->data['user_posts'] : 0,
 					'POSTS_DAY'			=> sprintf($user->lang['POST_DAY'], $posts_per_day),
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php
index 3616e06c77..ceaa3e5516 100644
--- a/phpBB/includes/ucp/ucp_pm_viewfolder.php
+++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php
@@ -241,7 +241,13 @@ function view_folder($id, $mode, $folder_id, $folder, $type)
 
 				decode_message($message_row['message_text'], $message_row['bbcode_uid']);
 
-				$data[] = array('subject' => censor_text($row['message_subject']), 'sender' => $row['username'], 'date' => $user->format_date($row['message_time']), 'to' => ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? $address[$message_id] : '', 'message' => $message_row['message_text']);
+				$data[] = array(
+					'subject'	=> censor_text($row['message_subject']),
+					'sender'	=> $row['username'],
+					'date'		=> $user->format_date($row['message_time']),
+					'to'		=> ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? $address[$message_id] : '',
+					'message'	=> $message_row['message_text']
+				);
 			}
 
 			switch ($export_type)
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index bb8a89a879..200692d459 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -166,7 +166,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 		'AUTHOR_RANK' 		=> $user_info['rank_title'],
 		'RANK_IMAGE' 		=> $user_info['rank_image'],
 		'AUTHOR_AVATAR'		=> (isset($user_info['avatar'])) ? $user_info['avatar'] : '',
-		'AUTHOR_JOINED'		=> $user->format_date($user_info['user_regdate'], $user->lang['DATE_FORMAT']),
+		'AUTHOR_JOINED'		=> $user->format_date($user_info['user_regdate']),
 		'AUTHOR_POSTS' 		=> (!empty($user_info['user_posts'])) ? $user_info['user_posts'] : '',
 		'AUTHOR_FROM' 		=> (!empty($user_info['user_from'])) ? $user_info['user_from'] : '',
 
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index afcdafe09f..ce788c1230 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1125,8 +1125,8 @@ function show_profile($data)
 		'USERNAME'		=> $username,
 		'USER_COLOR'	=> (!empty($data['user_colour'])) ? $data['user_colour'] : '',
 		'RANK_TITLE'	=> $rank_title,
-		'JOINED'		=> $user->format_date($data['user_regdate'], $user->lang['DATE_FORMAT']),
-		'VISITED'		=> (empty($last_visit)) ? ' - ' : $user->format_date($last_visit, $user->lang['DATE_FORMAT']),
+		'JOINED'		=> $user->format_date($data['user_regdate']),
+		'VISITED'		=> (empty($last_visit)) ? ' - ' : $user->format_date($last_visit),
 		'POSTS'			=> ($data['user_posts']) ? $data['user_posts'] : 0,
   		'WARNINGS'		=> isset($data['user_warnings']) ? $data['user_warnings'] : 0,
 
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 50fd341727..1ea8750f64 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -883,7 +883,7 @@ while ($row = $db->sql_fetchrow($result))
 			$id_cache[] = $poster_id;
 			
 			$user_cache[$poster_id] = array(
-				'joined'		=> $user->format_date($row['user_regdate'], $user->lang['DATE_FORMAT']),
+				'joined'		=> $user->format_date($row['user_regdate']),
 				'posts'			=> $row['user_posts'],
 				'warnings'		=> (isset($row['user_warnings'])) ? $row['user_warnings'] : 0,
 				'from'			=> (!empty($row['user_from'])) ? $row['user_from'] : '',