diff --git a/application/controllers/Appointments.php b/application/controllers/Appointments.php
index 20d9bd83..048a8991 100755
--- a/application/controllers/Appointments.php
+++ b/application/controllers/Appointments.php
@@ -81,6 +81,7 @@ class Appointments extends EA_Controller {
         $privacy_policy_content = setting('privacy_policy_content');
         $display_any_provider = setting('display_any_provider');
         $timezones = $this->timezones->to_array();
+        $grouped_timezones = $this->timezones->to_grouped_array();
 
         // Remove the data that are not needed inside the $available_providers array.
         foreach ($available_providers as &$available_provider)
@@ -180,6 +181,7 @@ class Appointments extends EA_Controller {
             'display_privacy_policy' => $display_privacy_policy,
             'privacy_policy_content' => $privacy_policy_content,
             'timezones' => $timezones,
+            'grouped_timezones' => $grouped_timezones,
             'display_any_provider' => $display_any_provider,
         ]);
     }
diff --git a/application/views/pages/booking/booking_step_2.php b/application/views/pages/booking/booking_step_2.php
index d03299ac..9036e310 100644
--- a/application/views/pages/booking/booking_step_2.php
+++ b/application/views/pages/booking/booking_step_2.php
@@ -1,3 +1,9 @@
+<?php
+/**
+ * @var array $grouped_timezones
+ */
+?>
+
 <div id="wizard-frame-2" class="wizard-frame" style="display:none;">
     <div class="frame-container">
 
@@ -12,7 +18,7 @@
                 <div id="select-time">
                     <div class="form-group">
                         <label for="select-timezone"><?= lang('timezone') ?></label>
-                        <?= render_timezone_dropdown('id="select-timezone" class="form-control" value="UTC"'); ?>
+                        <?php component('timezone_dropdown','id="select-timezone" class="form-control" value="UTC"', ['timezones' => $grouped_timezones]) ?>
                     </div>
 
                     <div id="available-hours"></div>