diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php
index 67bb56efae..086f347154 100644
--- a/phpBB/includes/ucp/ucp_main.php
+++ b/phpBB/includes/ucp/ucp_main.php
@@ -189,7 +189,7 @@ 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']),
-					'LAST_ACTIVITY'			=> (empty($last_activity)) ? ' - ' : $user->format_date($last_activity),
+					'LAST_ACTIVE'			=> (empty($last_activity)) ? ' - ' : $user->format_date($last_activity),
 					'WARNINGS'			=> ($user->data['user_warnings']) ? $user->data['user_warnings'] : 0,
 					'POSTS'				=> ($user->data['user_posts']) ? $user->data['user_posts'] : 0,
 					'POSTS_DAY'			=> $user->lang('POST_DAY', $posts_per_day),
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 3228b4fffc..c7f301fb8c 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -85,7 +85,6 @@ $lang = array_merge($lang, array(
 	'IM_USER'				=> 'Send an instant message',
 
 	'LAST_ACTIVE'				=> 'Last active',
-	'LAST_ACTIVITY'				=> 'Last activity',
 	'LESS_THAN'					=> 'Less than',
 	'LIST_USERS'				=> array(
 		1	=> '%d user',
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 9f0ac93545..c980daff21 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1703,7 +1703,7 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f
 		'AGE'			=> $age,
 		'RANK_TITLE'	=> $rank_title,
 		'JOINED'		=> $user->format_date($data['user_regdate']),
-		'LAST_ACTIVITY'		=> (empty($last_activity)) ? ' - ' : $user->format_date($last_activity),
+		'LAST_ACTIVE'		=> (empty($last_activity)) ? ' - ' : $user->format_date($last_activity),
 		'POSTS'			=> ($data['user_posts']) ? $data['user_posts'] : 0,
 		'WARNINGS'		=> isset($data['user_warnings']) ? $data['user_warnings'] : 0,
 
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index 9e66a8b020..7ba289cfd6 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -113,7 +113,7 @@
 		<td class="posts"><!-- IF memberrow.POSTS and S_DISPLAY_SEARCH --><a href="{memberrow.U_SEARCH_USER}" title="{L_SEARCH_USER_POSTS}">{memberrow.POSTS}</a><!-- ELSE -->{memberrow.POSTS}<!-- ENDIF --></td>
 		<td class="info"><!-- BEGIN custom_fields --><div>{memberrow.custom_fields.PROFILE_FIELD_VALUE}</div><!-- BEGINELSE -->&nbsp;<!-- END custom_fields --></td>
 		<td>{memberrow.JOINED}</td>
-		<!-- IF S_VIEWONLINE --><td>{memberrow.LAST_ACTIVITY}&nbsp;</td><!-- ENDIF -->
+		<!-- IF S_VIEWONLINE --><td>{memberrow.LAST_ACTIVE}&nbsp;</td><!-- ENDIF -->
 	</tr>
 		<!-- BEGINELSE -->
 	<tr class="bg1">
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index 0273760d8d..874db3c9a7 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -85,7 +85,7 @@
 		<dl class="details">
 			<!-- EVENT memberlist_view_user_statistics_before -->
 			<dt>{L_JOINED}{L_COLON}</dt> <dd>{JOINED}</dd>
-			<dt>{L_LAST_ACTIVITY}{L_COLON}</dt> <dd>{LAST_ACTIVITY}</dd>
+			<dt>{L_LAST_ACTIVE}{L_COLON}</dt> <dd>{LAST_ACTIVE}</dd>
 			<!-- IF S_WARNINGS -->
 			<dt>{L_WARNINGS}{L_COLON} </dt>
 			<dd><strong>{WARNINGS}</strong><!-- IF U_NOTES or U_WARN --> [ <!-- IF U_NOTES --><a href="{U_NOTES}">{L_VIEW_NOTES}</a><!-- ENDIF --> <!-- IF U_WARN --><!-- IF U_NOTES --> | <!-- ENDIF --><a href="{U_WARN}">{L_WARN_USER}</a><!-- ENDIF --> ]<!-- ENDIF --></dd>
diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html
index 2f9b5e559b..861cf87c92 100644
--- a/phpBB/styles/prosilver/template/ucp_main_front.html
+++ b/phpBB/styles/prosilver/template/ucp_main_front.html
@@ -60,7 +60,7 @@
 
 	<dl class="details">
 		<dt>{L_JOINED}{L_COLON}</dt> <dd>{JOINED}</dd>
-		<dt>{L_LAST_ACTIVITY}{L_COLON}</dt> <dd>{LAST_VISIT_YOU}</dd>
+		<dt>{L_LAST_ACTIVE}{L_COLON}</dt> <dd>{LAST_VISIT_YOU}</dd>
 		<dt>{L_TOTAL_POSTS}{L_COLON}</dt> <dd><!-- IF POSTS_PCT -->{POSTS}<!-- IF S_DISPLAY_SEARCH --> | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></strong><!-- ENDIF --><br />({POSTS_DAY} / {POSTS_PCT})<!-- ELSE -->{POSTS}<!-- ENDIF --></dd>
 		<!-- IF ACTIVE_FORUM != '' --><dt>{L_ACTIVE_IN_FORUM}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF -->
 		<!-- IF ACTIVE_TOPIC != '' --><dt>{L_ACTIVE_IN_TOPIC}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html
index 72eeef5a0c..022d185430 100644
--- a/phpBB/styles/subsilver2/template/memberlist_view.html
+++ b/phpBB/styles/subsilver2/template/memberlist_view.html
@@ -72,8 +72,8 @@
 				<td width="100%"><b class="gen">{JOINED}</b></td>
 			</tr>
 			<tr>
-				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_LAST_ACTIVITY}{L_COLON} </td>
-				<td width="100%"><b class="gen">{LAST_ACTIVITY}</b></td>
+				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_LAST_ACTIVE}{L_COLON} </td>
+				<td width="100%"><b class="gen">{LAST_ACTIVE}</b></td>
 			</tr>
 			<!-- IF S_WARNINGS -->
 				<tr>