diff --git a/Sources/Security.php b/Sources/Security.php
index 633aab20e0..54f60eec1a 100644
--- a/Sources/Security.php
+++ b/Sources/Security.php
@@ -104,8 +104,6 @@ function is_not_guest($message = '')
 		return;
 
 	// Log what they were trying to do didn't work)
-	if (!empty($modSettings['who_enabled']))
-		$_GET['error'] = 'guest_login';
 	writeLog(true);
 
 	// Just die.
diff --git a/Sources/Who.php b/Sources/Who.php
index b9b5012a80..73c0f5388e 100644
--- a/Sources/Who.php
+++ b/Sources/Who.php
@@ -448,8 +448,6 @@ function determineActions($urls, $preferred_prefix = false)
 
 			if (isset($txt[$actions['error']]))
 				$error_message = str_replace('"', '"', empty($actions['error_params']) ? $txt[$actions['error']] : vsprintf($txt[$actions['error']], (array) $actions['error_params']));
-			elseif ($actions['error'] == 'guest_login')
-				$error_message = str_replace('"', '"', $txt['who_guest_login']);
 			else
 				$error_message = str_replace('"', '"', $actions['error']);
 
diff --git a/Themes/default/languages/Who.english.php b/Themes/default/languages/Who.english.php
index 030e4ce96b..27189cd04e 100644
--- a/Themes/default/languages/Who.english.php
+++ b/Themes/default/languages/Who.english.php
@@ -19,7 +19,6 @@
 $txt['who_no_online_spiders'] = 'There are currently no spiders online.';
 $txt['who_no_online_guests'] = 'There are currently no guests online.';
 $txt['who_no_online_members'] = 'There are currently no members online.';
-$txt['who_guest_login'] = 'User has been taken to the login page.';
 
 $txt['whospider_login'] = 'Viewing the login page.';
 $txt['whospider_register'] = 'Viewing the registration page.';
diff --git a/index.php b/index.php
index 2ff89336ba..1969626b51 100644
--- a/index.php
+++ b/index.php
@@ -264,18 +264,6 @@ function smf_main()
 	);
 	call_integration_hook('integrate_pre_log_stats', array(&$no_stat_actions));
 
-	$should_log = !is_filtered_request($no_stat_actions, 'action');
-	if ($should_log)
-	{
-		// Log this user as online.
-		writeLog();
-
-		// Track forum statistics and hits...?
-		if (!empty($modSettings['hitStats']))
-			trackStats(array('hits' => '+'));
-	}
-	unset($no_stat_actions);
-
 	// Make sure that our scheduled tasks have been running as intended
 	check_cron();
 
@@ -337,6 +325,18 @@ function smf_main()
 		}
 	}
 
+	$should_log = !is_filtered_request($no_stat_actions, 'action');
+	if ($should_log)
+	{
+		// Log this user as online.
+		writeLog();
+
+		// Track forum statistics and hits...?
+		if (!empty($modSettings['hitStats']))
+			trackStats(array('hits' => '+'));
+	}
+	unset($no_stat_actions);
+
 	// Here's the monstrous $_REQUEST['action'] array - $_REQUEST['action'] => array($file, $function).
 	$actionArray = array(
 		'agreement' => array('Agreement.php', 'Agreement'),