diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index af39ecf2fa..46e82d03ba 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -987,7 +987,7 @@ class session
 					// For SQLite versions 3.8.3+ which support Common Table Expressions (CTE)
 					$sql = "WITH s3 (session_page, session_user_id, session_time) AS ($sql_select)
 						UPDATE " . USERS_TABLE . '
-						SET (user_lastpage, user_lastvisit) = (SELECT session_page, session_time FROM s3 WHERE session_user_id = user_id)
+						SET (user_lastpage, user_lastvisit, user_last_active) = (SELECT session_page, session_time, session_time FROM s3 WHERE session_user_id = user_id)
 						WHERE EXISTS (SELECT session_user_id FROM s3 WHERE session_user_id = user_id)';
 					$db->sql_query($sql);
 
@@ -1000,7 +1000,9 @@ class session
 				while ($row = $db->sql_fetchrow($result))
 				{
 					$sql = 'UPDATE ' . USERS_TABLE . '
-						SET user_lastvisit = ' . (int) $row['recent_time'] . ", user_lastpage = '" . $db->sql_escape($row['session_page']) . "'
+						SET user_lastvisit = ' . (int) $row['recent_time'] . ',
+							user_last_active = ' .  (int) $row['recent_time'] . ",
+							user_lastpage = '" . $db->sql_escape($row['session_page']) . "'
 						WHERE user_id = " . (int) $row['session_user_id'];
 					$db->sql_query($sql);
 				}
@@ -1010,14 +1012,14 @@ class session
 			case 'mysqli':
 				$sql = 'UPDATE ' . USERS_TABLE . " u,
 					($sql_select) s3
-					SET u.user_lastvisit = s3.recent_time, u.user_lastpage = s3.session_page
+					SET u.user_lastvisit = s3.recent_time, u.user_last_active = s3.recent_time, u.user_lastpage = s3.session_page
 					WHERE u.user_id = s3.session_user_id";
 				$db->sql_query($sql);
 			break;
 
 			default:
 				$sql = 'UPDATE ' . USERS_TABLE . "
-					SET user_lastvisit = s3.recent_time, user_lastpage = s3.session_page
+					SET user_lastvisit = s3.recent_time, user_last_active = s3.recent_time, user_lastpage = s3.session_page
 					FROM ($sql_select) s3
 					WHERE user_id = s3.session_user_id";
 				$db->sql_query($sql);
diff --git a/tests/session/fixtures/sessions_garbage.xml b/tests/session/fixtures/sessions_garbage.xml
index 59a2dc2ebe..16971428a7 100644
--- a/tests/session/fixtures/sessions_garbage.xml
+++ b/tests/session/fixtures/sessions_garbage.xml
@@ -7,6 +7,7 @@
 		<column>user_sig</column>
 		<column>user_lastpage</column>
 		<column>user_lastvisit</column>
+		<column>user_last_active</column>
 		<row>
 			<value>4</value>
 			<value>bar</value>
@@ -14,6 +15,7 @@
 			<value></value>
 			<value>oldpage_user_bar.php</value>
 			<value>1400000000</value>
+			<value>1300000999</value>
 		</row>
 		<row>
 			<value>5</value>
@@ -22,6 +24,7 @@
 			<value></value>
 			<value>oldpage_user_foo.php</value>
 			<value>1400000000</value>
+			<value>1300000998</value>
 		</row>
 	</table>
 	<table name="phpbb_sessions">
diff --git a/tests/session/garbage_collection_test.php b/tests/session/garbage_collection_test.php
index 9080478a28..32c4db3f85 100644
--- a/tests/session/garbage_collection_test.php
+++ b/tests/session/garbage_collection_test.php
@@ -65,11 +65,13 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case
 				[
 					'username_clean' => 'bar',
 					'user_lastvisit' => 1400000000,
+					'user_last_active' => 1300000999,
 					'user_lastpage' => 'oldpage_user_bar.php',
 				],
 				[
 					'username_clean' => 'foo',
 					'user_lastvisit' => 1400000000,
+					'user_last_active' => 1300000998,
 					'user_lastpage' => 'oldpage_user_foo.php',
 				],
 			],
@@ -89,11 +91,13 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case
 				[
 					'username_clean' => 'bar',
 					'user_lastvisit' => '1500000000',
+					'user_last_active' => '1500000000',
 					'user_lastpage' => 'newpage_user_bar.php',
 				],
 				[
 					'username_clean' => 'foo',
 					'user_lastvisit' => '1500000000',
+					'user_last_active' => '1500000000',
 					'user_lastpage' => 'newpage_user_foo.php',
 				],
 			],
diff --git a/tests/test_framework/phpbb_session_test_case.php b/tests/test_framework/phpbb_session_test_case.php
index deb76d4e5e..15b5d44eb5 100644
--- a/tests/test_framework/phpbb_session_test_case.php
+++ b/tests/test_framework/phpbb_session_test_case.php
@@ -50,7 +50,7 @@ abstract class phpbb_session_test_case extends phpbb_database_test_case
 
 	protected function check_user_session_data($expected_session_data, $message)
 	{
-		$sql= 'SELECT username_clean, user_lastvisit, user_lastpage
+		$sql= 'SELECT username_clean, user_lastvisit, user_last_active, user_lastpage
 			FROM ' . USERS_TABLE . '
 			ORDER BY user_id';