diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index 6efc269db..d97de283a 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -1564,9 +1564,9 @@ function bb_date ($gmepoch, $format = false, $tz = null)
 
 	if (is_null($tz))
 	{
-		if (!$userdata['session_logged_in'])
-		{
			$tz = $userdata['user_timezone'];
		}
-		else $tz = $bb_cfg['board_timezone'];
+		if (empty($userdata['session_logged_in']))
+		{
			$tz = $bb_cfg['board_timezone'];
		}
+		else $tz = $userdata['user_timezone'];
 	}
 	if (!$format)
 	{