diff --git a/phpBB/adm/style/form_macros.twig b/phpBB/adm/style/form_macros.twig
index 845d039ddd..35fe1bf4df 100644
--- a/phpBB/adm/style/form_macros.twig
+++ b/phpBB/adm/style/form_macros.twig
@@ -37,10 +37,30 @@
 	<label>{{ _self.input(form_data.buttons[1]) ~ form_data.buttons[1].label }}</label>
 {% endmacro %}
 
-{% macro select(form_data) %}
-	<select {% if form_data.id %}id="{{ form_data.id }}"{% endif %} name="{{ form_data.name }}"{% if form_data.toggleable %} data-togglable-settings="true"{% endif %}>
-		{% for option in form_data.options %}
-			<option value="{{ option.value }}"{% if option.selected %} selected="selected"{% endif %}>{{ option.label }}</option>
+{% macro select(form_data, class, id, name, group_only) %}
+	{% apply  replace({"\n": ' ', '\t': ''}) %}
+		<select
+			{% if id %}id="{{ id }}"{% endif %}
+			{% if class %}class="{{ class }}"{% endif %}
+			name="{% if name %}{{ name }}{% else %}{{ form_data.name }}{% endif %}"
+			{% if form_data.toggleable %}data-togglable-settings="true"{% endif %}>
+	{% endapply %}
+		{% for element in form_data.options %}
+			{% if not group_only and element.options %}
+				{% apply  replace({"\n": ' ', '\t': ''}) %}
+					<optgroup
+						label="{{ element.label }}"
+					{% for key, value in element.data %}
+						data-{{ key }}="{{ value }}"
+					{% endfor %}>
+				{% endapply %}
+					{% for option in element.options %}
+						<option value="{{ option.value }}"{% if option.selected %} selected="selected"{% endif %}>{{ option.label }}</option>
+					{% endfor %}
+				</optgroup>
+			{% else %}
+				<option value="{{ element.value }}"{% if element.selected %} selected="selected"{% endif %}>{{ element.label }}</option>
+			{% endif %}
 		{% endfor %}
 	</select>
 {% endmacro %}
diff --git a/phpBB/adm/style/timezone_option.html b/phpBB/adm/style/timezone_option.html
index acfff30184..7ca0e3be26 100644
--- a/phpBB/adm/style/timezone_option.html
+++ b/phpBB/adm/style/timezone_option.html
@@ -1,27 +1,16 @@
 <dl>
-	<dt><label for="timezone">{L_BOARD_TIMEZONE}{L_COLON}</label></dt>
-	<!-- IF .timezone_date -->
-	<dd id="tz_select_date" style="display: none;">
-		<select name="tz_date" id="tz_date" class="autowidth tz_select">
-			<option value="">{L_SELECT_CURRENT_TIME}</option>
-			<!-- BEGIN timezone_date -->
-			<option value="{timezone_date.VALUE}"<!-- IF timezone_date.SELECTED --> selected="selected"<!-- ENDIF -->>{timezone_date.TITLE}</option>
-			<!-- END timezone_date -->
-		</select>
+	{% from "form_macros.twig" import select %}
+	<dt><label for="timezone">{{ lang('BOARD_TIMEZONE') | lang('COLON') }}</label></dt>
+	{% if TIMEZONE_OPTIONS %}
+	<dd id="tz_select_date hidden">
+		{% set tz_date_data = TIMEZONE_OPTIONS|merge({ options: [{ value: "", label: lang('SELECT_CURRENT_TIME') }]|merge(TIMEZONE_OPTIONS.options) }) %}
+		{{ select(tz_date_data, 'autowidth tz_select', 'tz_date', 'tz_date', true) }}
 	</dd>
-	<!-- ENDIF -->
+	{% endif %}
 	<dd>
-		<select name="tz" id="timezone" class="autowidth tz_select">
-			<option value="">{L_SELECT_TIMEZONE}</option>
-			<!-- BEGIN timezone_select -->
-			<optgroup label="{timezone_select.LABEL}" data-tz-value="{timezone_select.VALUE}">
-				<!-- BEGIN timezone_options -->
-				<option title="{timezone_select.timezone_options.TITLE}" value="{timezone_select.timezone_options.VALUE}"<!-- IF timezone_select.timezone_options.SELECTED --> selected="selected"<!-- ENDIF -->>{timezone_select.timezone_options.LABEL}</option>
-				<!-- END timezone_options -->
-			</optgroup>
-			<!-- END timezone_select -->
-		</select>
+		{% set tz_select_data = TIMEZONE_OPTIONS|merge({ options: [{ value: "", label: lang('SELECT_TIMEZONE') }]|merge(TIMEZONE_OPTIONS.options) }) %}
+		{{ select(tz_select_data, 'autowidth tz_select', 'timezone') }}
 
-		<!-- INCLUDEJS timezone.js -->
+		{% INCLUDEJS('timezone.js') %}
 	</dd>
 </dl>
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 18fccae5a5..e394424a9f 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -1052,11 +1052,15 @@ class acp_board
 	*/
 	function timezone_select($value, $key)
 	{
-		global $template, $user;
+		global $user;
 
-		$timezone_select = phpbb_timezone_select($template, $user, $value, true);
+		$timezone_select = phpbb_timezone_select($user, $value, true);
 
-		return '<select name="config[' . $key . ']" id="' . $key . '">' . $timezone_select . '</select>';
+		return [
+			'tag'			=> 'select',
+			'name'			=> 'config[' . $key . ']',
+			'options'		=> $timezone_select,
+		];
 	}
 
 	/**
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 9aa3333e77..8be78c24f2 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1795,7 +1795,7 @@ class acp_users
 					${'s_sort_' . $sort_option . '_dir'} .= '</select>';
 				}
 
-				phpbb_timezone_select($template, $user, $data['tz'], true);
+				$timezone_select = phpbb_timezone_select($user, $data['tz'], true);
 				$lang_options = phpbb_language_select($db, $data['lang']);
 
 				$user_prefs_data = array(
@@ -1839,6 +1839,11 @@ class acp_users
 						'options'	=> $lang_options,
 					],
 					'S_STYLE_OPTIONS'	=> style_select($data['style']),
+					'TIMEZONE_OPTIONS'	=> [
+						'tag'		=> 'select',
+						'name'		=> 'tz',
+						'options'	=> $timezone_select,
+					],
 				);
 
 				/**
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index ae8b978c69..48efdca0d8 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -443,14 +443,13 @@ function phpbb_get_timezone_identifiers($selected_timezone)
 /**
 * Options to pick a timezone and date/time
 *
-* @param	\phpbb\template\template $template	phpBB template object
 * @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	string		Returns an array containing the options for the time selector.
 */
-function phpbb_timezone_select($template, $user, $default = '', $truncate = false)
+function phpbb_timezone_select($user, $default = '', $truncate = false)
 {
 	static $timezones;
 
@@ -482,27 +481,22 @@ function phpbb_timezone_select($template, $user, $default = '', $truncate = fals
 		uksort($timezones, 'phpbb_tz_select_compare');
 	}
 
-	$tz_select = $opt_group = '';
+	$opt_group = '';
+	$tz_data = [];
 
 	foreach ($timezones as $key => $timezone)
 	{
 		if ($opt_group != $timezone['offset'])
 		{
-			// Generate tz_select for backwards compatibility
-			$tz_select .= ($opt_group) ? '</optgroup>' : '';
-			$tz_select .= '<optgroup label="' . $user->lang(array('timezones', 'UTC_OFFSET_CURRENT'), $timezone['offset'], $timezone['current']) . '">';
-			$opt_group = $timezone['offset'];
-			$template->assign_block_vars('timezone_select', array(
-				'LABEL'		=> $user->lang(array('timezones', 'UTC_OFFSET_CURRENT'), $timezone['offset'], $timezone['current']),
-				'VALUE'		=> $key . ' - ' . $timezone['current'],
-			));
+			$tz_data[$timezone['offset']] = [
+				'label'		=> $user->lang(array('timezones', 'UTC_OFFSET_CURRENT'), $timezone['offset'], $timezone['current']),
+				'value'		=> $key . ' - ' . $timezone['current'],
+				'options'	=> [],
+				'selected'	=> !empty($default_offset) && strpos($key, $default_offset) !== false,
+				'data'		=> ['tz-value'	=> $key . ' - ' . $timezone['current']],
+			];
 
-			$selected = (!empty($default_offset) && strpos($key, $default_offset) !== false) ? ' selected="selected"' : '';
-			$template->assign_block_vars('timezone_date', array(
-				'VALUE'		=> $key . ' - ' . $timezone['current'],
-				'SELECTED'	=> !empty($selected),
-				'TITLE'		=> $user->lang(array('timezones', 'UTC_OFFSET_CURRENT'), $timezone['offset'], $timezone['current']),
-			));
+			$opt_group = $timezone['offset'];
 		}
 
 		$label = $timezone['tz'];
@@ -517,19 +511,15 @@ function phpbb_timezone_select($template, $user, $default = '', $truncate = fals
 			$label = truncate_string($label, 50, 255, false, '...');
 		}
 
-		// Also generate timezone_select for backwards compatibility
-		$selected = ($timezone['tz'] === $default) ? ' selected="selected"' : '';
-		$tz_select .= '<option title="' . $title . '" value="' . $timezone['tz'] . '"' . $selected . '>' . $label . '</option>';
-		$template->assign_block_vars('timezone_select.timezone_options', array(
+		$tz_data[$timezone['offset']]['options'][] = [
 			'TITLE'			=> $title,
-			'VALUE'			=> $timezone['tz'],
-			'SELECTED'		=> !empty($selected),
-			'LABEL'			=> $label,
-		));
+			'value'			=> $timezone['tz'],
+			'selected'		=> $timezone['tz'] === $default,
+			'label'			=> $label,
+		];
 	}
-	$tz_select .= '</optgroup>';
 
-	return $tz_select;
+	return $tz_data;
 }
 
 // Functions handling topic/post tracking/marking
diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php
index 77b2ef4220..95def7b7e9 100644
--- a/phpBB/includes/functions_compatibility.php
+++ b/phpBB/includes/functions_compatibility.php
@@ -111,9 +111,9 @@ function phpbb_clean_path($path)
 */
 function tz_select($default = '', $truncate = false)
 {
-	global $template, $user;
+	global $user;
 
-	return phpbb_timezone_select($template, $user, $default, $truncate);
+	return phpbb_timezone_select($user, $default, $truncate);
 }
 
 /**
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index 625ade741c..dcbd2624f2 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -156,7 +156,7 @@ class ucp_prefs
 				}
 				$dateformat_options .= '>' . $user->lang['CUSTOM_DATEFORMAT'] . '</option>';
 
-				phpbb_timezone_select($template, $user, $data['tz'], true);
+				$timezone_select = phpbb_timezone_select($user, $data['tz'], true);
 
 				// check if there are any user-selectable languages
 				$sql = 'SELECT lang_iso, lang_local_name
@@ -206,6 +206,11 @@ class ucp_prefs
 						'options'	=> $lang_options,
 					],
 					'S_STYLE_OPTIONS'		=> ($config['override_user_style']) ? '' : style_select($data['user_style'], false, $styles_row),
+					'TIMEZONE_OPTIONS'	=> [
+						'tag'		=> 'select',
+						'name'		=> 'tz',
+						'options'	=> $timezone_select,
+					],
 					'S_CAN_HIDE_ONLINE'		=> ($auth->acl_get('u_hideonline')) ? true : false,
 					'S_SELECT_NOTIFY'		=> ($config['jab_enable'] && $user->data['user_jabber'] && @extension_loaded('xml')) ? true : false)
 				);
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index bdece67890..b739cb6ce8 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -626,7 +626,7 @@ class ucp_register
 		}
 
 		// Assign template vars for timezone select
-		phpbb_timezone_select($template, $user, $data['tz'], true);
+		$timezone_select = phpbb_timezone_select($user, $data['tz'], true);
 
 		// Checking amount of available languages
 		$sql = 'SELECT lang_iso, lang_local_name
@@ -653,6 +653,11 @@ class ucp_register
 				'name'		=> 'lang',
 				'options'	=> $lang_options,
 			],
+			'TIMEZONE_OPTIONS'	=> [
+				'tag'		=> 'select',
+				'name'		=> 'tz',
+				'options'	=> $timezone_select,
+			],
 			'S_TZ_PRESELECT'	=> !$submit,
 			'S_CONFIRM_REFRESH'	=> ($config['enable_confirm'] && $config['confirm_refresh']) ? true : false,
 			'S_REGISTRATION'	=> true,
diff --git a/phpBB/styles/all/template/macros/form_macros.twig b/phpBB/styles/all/template/macros/form_macros.twig
index 845d039ddd..074891a5ee 100644
--- a/phpBB/styles/all/template/macros/form_macros.twig
+++ b/phpBB/styles/all/template/macros/form_macros.twig
@@ -37,11 +37,31 @@
 	<label>{{ _self.input(form_data.buttons[1]) ~ form_data.buttons[1].label }}</label>
 {% endmacro %}
 
-{% macro select(form_data) %}
-	<select {% if form_data.id %}id="{{ form_data.id }}"{% endif %} name="{{ form_data.name }}"{% if form_data.toggleable %} data-togglable-settings="true"{% endif %}>
-		{% for option in form_data.options %}
-			<option value="{{ option.value }}"{% if option.selected %} selected="selected"{% endif %}>{{ option.label }}</option>
-		{% endfor %}
+{% macro select(form_data, class, id, name, group_only) %}
+	{% apply  replace({"\n": ' ', '\t': ''}) %}
+		<select
+		{% if id %}id="{{ id }}"{% endif %}
+		{% if class %}class="{{ class }}"{% endif %}
+		name="{% if name %}{{ name }}{% else %}{{ form_data.name }}{% endif %}"
+		{% if form_data.toggleable %}data-togglable-settings="true"{% endif %}>
+	{% endapply %}
+	{% for element in form_data.options %}
+		{% if not group_only and element.options %}
+			{% apply  replace({"\n": ' ', '\t': ''}) %}
+				<optgroup
+				label="{{ element.label }}"
+				{% for key, value in element.data %}
+					data-{{ key }}="{{ value }}"
+				{% endfor %}>
+			{% endapply %}
+			{% for option in element.options %}
+				<option value="{{ option.value }}"{% if option.selected %} selected="selected"{% endif %}>{{ option.label }}</option>
+			{% endfor %}
+			</optgroup>
+		{% else %}
+			<option value="{{ element.value }}"{% if element.selected %} selected="selected"{% endif %}>{{ element.label }}</option>
+		{% endif %}
+	{% endfor %}
 	</select>
 {% endmacro %}
 
diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html
index 01786d5ef4..47da5f63c1 100644
--- a/phpBB/styles/prosilver/template/timezone_option.html
+++ b/phpBB/styles/prosilver/template/timezone_option.html
@@ -1,28 +1,17 @@
 <dl>
-	<dt><label for="timezone">{L_BOARD_TIMEZONE}{L_COLON}</label></dt>
-	<!-- IF .timezone_date -->
-	<dd id="tz_select_date" style="display: none;">
-		<select name="tz_date" id="tz_date" class="autowidth tz_select">
-			<option value="">{L_SELECT_CURRENT_TIME}</option>
-			<!-- BEGIN timezone_date -->
-				<option value="{timezone_date.VALUE}"<!-- IF timezone_date.SELECTED --> selected="selected"<!-- ENDIF -->>{timezone_date.TITLE}</option>
-			<!-- END timezone_date -->
-		</select>
+	{% from "macros/form_macros.twig" import select %}
+	<dt><label for="timezone">{{ lang('BOARD_TIMEZONE') ~ lang('COLON') }}</label></dt>
+	{% if TIMEZONE_OPTIONS %}
+	<dd id="tz_select_date hidden">
+		{% set tz_date_data = TIMEZONE_OPTIONS|merge({ options: [{ value: "", label: lang('SELECT_CURRENT_TIME') }]|merge(TIMEZONE_OPTIONS.options) }) %}
+		{{ select(tz_date_data, 'autowidth tz_select', 'tz_date', 'tz_date', true) }}
 		<input type="button" id="tz_select_date_suggest" class="button1 button button-form-bold" style="display: none;" timezone-preselect="<!-- IF S_TZ_PRESELECT -->true<!-- ELSE -->false<!-- ENDIF -->" data-l-suggestion="{L_TIMEZONE_DATE_SUGGESTION}" value="{L_TIMEZONE_DATE_SUGGESTION}" />
 	</dd>
-	<!-- ENDIF -->
+	{% endif %}
 	<dd>
-		<select name="tz" id="timezone" class="autowidth tz_select timezone">
-			<option value="">{L_SELECT_TIMEZONE}</option>
-			<!-- BEGIN timezone_select -->
-			<optgroup label="{timezone_select.LABEL}" data-tz-value="{timezone_select.VALUE}">
-				<!-- BEGIN timezone_options -->
-				<option title="{timezone_select.timezone_options.TITLE}" value="{timezone_select.timezone_options.VALUE}"<!-- IF timezone_select.timezone_options.SELECTED --> selected="selected"<!-- ENDIF -->>{timezone_select.timezone_options.LABEL}</option>
-				<!-- END timezone_options -->
-			</optgroup>
-			<!-- END timezone_select -->
-		</select>
+		{% set tz_select_data = TIMEZONE_OPTIONS|merge({ options: [{ value: "", label: lang('SELECT_TIMEZONE') }]|merge(TIMEZONE_OPTIONS.options) }) %}
+		{{ select(tz_select_data, 'autowidth tz_select timezone', 'timezone') }}
 
-		<!-- INCLUDEJS timezone.js -->
+		{% INCLUDEJS('timezone.js') %}
 	</dd>
 </dl>