diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 937d9e926f..575d05933f 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -901,7 +901,9 @@ class acp_board
 	*/
 	function timezone_select($value, $key)
 	{
-		$timezone_select = phpbb_timezone_select($value, true);
+		global $user;
+
+		$timezone_select = phpbb_timezone_select($user, $value, true);
 		$timezone_select['tz_select'];
 
 		return '<select name="config[' . $key . ']" id="' . $key . '">' . $timezone_select['tz_select'] . '</select>';
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index a228e07c22..3f05f216d9 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1639,7 +1639,7 @@ class acp_users
 					${'s_sort_' . $sort_option . '_dir'} .= '</select>';
 				}
 
-				$timezone_selects = phpbb_timezone_select($data['tz'], true, false);
+				$timezone_selects = phpbb_timezone_select($user, $data['tz'], true);
 				$template->assign_vars(array(
 					'S_PREFS'			=> true,
 					'S_JABBER_DISABLED'	=> ($config['jab_enable'] && $user_row['user_jabber'] && @extension_loaded('xml')) ? false : true,
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 98465ca462..0b71ea3484 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1184,22 +1184,23 @@ function phpbb_get_timezone_identifiers($selected_timezone)
 */
 function tz_select($default = '', $truncate = false)
 {
-	$timezone_select = phpbb_timezone_select($default, $truncate);
+	global $user;
+
+	$timezone_select = phpbb_timezone_select($user, $default, $truncate);
 	return $timezone_select['tz_select'];
 }
 
 /**
 * Options to pick a timezone and date/time
 *
+* @param	phpbb_user	$user				Object of the current user
 * @param	string		$default			A timezone to select
 * @param	boolean		$truncate			Shall we truncate the options text
 *
 * @return		array		Returns an array, also containing the options for the time selector.
 */
-function phpbb_timezone_select($default = '', $truncate = false)
+function phpbb_timezone_select($user, $default = '', $truncate = false)
 {
-	global $user;
-
 	static $timezones;
 
 	$default_offset = '';
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index f63758c52d..2228bc7931 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -131,7 +131,7 @@ class ucp_prefs
 				}
 				$dateformat_options .= '>' . $user->lang['CUSTOM_DATEFORMAT'] . '</option>';
 
-				$timezone_selects = phpbb_timezone_select($data['tz'], true, false);
+				$timezone_selects = phpbb_timezone_select($user, $data['tz'], true);
 				$template->assign_vars(array(
 					'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
 
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 705000d7a8..6ce53a79ab 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -442,7 +442,7 @@ class ucp_register
 			break;
 		}
 
-		$timezone_selects = phpbb_timezone_select($data['tz'], true, false);
+		$timezone_selects = phpbb_timezone_select($user, $data['tz'], true);
 		$template->assign_vars(array(
 			'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
 			'USERNAME'			=> $data['username'],