diff --git a/phpBB/adm/style/timezone_option.html b/phpBB/adm/style/timezone_option.html
index 7a799b69c6..9b44585ff2 100644
--- a/phpBB/adm/style/timezone_option.html
+++ b/phpBB/adm/style/timezone_option.html
@@ -1,17 +1,25 @@
 <dl>
 	<dt><label for="timezone">{L_BOARD_TIMEZONE}{L_COLON}</label></dt>
-	<!-- IF S_TZ_DATE_OPTIONS -->
+	<!-- IF .tz_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>
-			{S_TZ_DATE_OPTIONS}
+			<!-- BEGIN tz_date -->
+			<option value="{tz_date.VALUE}"<!-- IF tz_date.SELECTED --> selected="selected"<!-- ENDIF -->>{tz_date.TITLE}</option>
+			<!-- END tz_date -->
 		</select>
 	</dd>
 	<!-- ENDIF -->
 	<dd>
 		<select name="tz" id="timezone" class="autowidth tz_select">
 			<option value="">{L_SELECT_TIMEZONE}</option>
-			{S_TZ_OPTIONS}
+			<!-- BEGIN tz_select -->
+			<optgroup label="{tz_select.LABEL}" data-tz-value="{tz_select.VALUE}">
+				<!-- BEGIN tz_options -->
+				<option title="{tz_select.tz_options.TITLE}" value="{tz_select.tz_options.VALUE}"<!-- IF tz_select.tz_options.SELECTED --> selected="selected"<!-- ENDIF -->>{tz_select.tz_options.LABEL}</option>
+				<!-- END tz_options -->
+			</optgroup>
+			<!-- END tz_select -->
 		</select>
 
 		<!-- INCLUDEJS timezone.js -->
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 1874bca7fc..c9239e534a 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1700,8 +1700,6 @@ class acp_users
 
 					'S_LANG_OPTIONS'	=> language_select($data['lang']),
 					'S_STYLE_OPTIONS'	=> style_select($data['style']),
-					'S_TZ_OPTIONS'			=> $timezone_selects['tz_select'],
-					'S_TZ_DATE_OPTIONS'		=> $timezone_selects['tz_dates'],
 				);
 
 				/**