diff --git a/application/controllers/Account.php b/application/controllers/Account.php
index f405119a..283250f6 100644
--- a/application/controllers/Account.php
+++ b/application/controllers/Account.php
@@ -71,7 +71,7 @@ class Account extends EA_Controller {
             'page_title' => lang('settings'),
             'active_menu' => PRIV_SYSTEM_SETTINGS,
             'user_display_name' => $this->accounts->get_user_display_name($user_id),
-            'timezones' => $this->timezones->to_array(),
+            'timezones' => $this->timezones->to_grouped_array(),
         ]);
 
         $this->load->view('pages/account', html_vars());
diff --git a/application/views/pages/account.php b/application/views/pages/account.php
index 7b4859e1..fb5c472e 100644
--- a/application/views/pages/account.php
+++ b/application/views/pages/account.php
@@ -136,7 +136,9 @@
                                     <label class="form-label" for="timezone">
                                         <?= lang('timezone') ?>
                                     </label>
-                                    <?= render_timezone_dropdown('id="timezone" class="form-control"') ?>
+                                    <?php component('timezone_dropdown', 'id="timezone" class="form-control required"', [
+                                        'timezones' => vars('timezones')
+                                    ]) ?>
                                 </div>
 
                                 <div class="form-check form-switch">