diff --git a/upload/config.php b/upload/config.php
index 06c0a0fcb..d99eba2c5 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -53,7 +53,7 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.1 Stable';
-$bb_cfg['tp_release_state'] = 'R264';
+$bb_cfg['tp_release_state'] = 'R267';
 $bb_cfg['tp_release_date'] = '30-08-2011';
 
 // Database
diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index 32522d5d9..6efc269db 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -1564,7 +1564,7 @@ function bb_date ($gmepoch, $format = false, $tz = null)
 
 	if (is_null($tz))
 	{
-		if(!IS_GUEST)
+		if (!$userdata['session_logged_in'])
 		{
			$tz = $userdata['user_timezone'];
		}
 		else $tz = $bb_cfg['board_timezone'];
 	}
@@ -1583,7 +1583,7 @@ function bb_date ($gmepoch, $format = false, $tz = null)
 
 	if(is_numeric($tz))
 	{
-        if(!IS_GUEST)
+        if (!$userdata['session_logged_in'])
 		{
 			$tz = $userdata['user_timezone'];
 		}