diff --git a/get_settings.php b/get_settings.php
index 28e057cf..6614a9f6 100644
--- a/get_settings.php
+++ b/get_settings.php
@@ -95,8 +95,9 @@ $config_login_message = $row['config_login_message'];
 $config_login_key_required = $row['config_login_key_required'];
 $config_login_key_secret = $row['config_login_key_secret'];
 
-// Currency
+// Locale
 $config_currency_format = "US_en";
+$config_timezone = $row['config_timezone'];
 
 // Theme
 $config_theme = $row['config_theme'];
diff --git a/post/setting.php b/post/setting.php
index ca76f778..1873277e 100644
--- a/post/setting.php
+++ b/post/setting.php
@@ -6,10 +6,10 @@
 
 if (isset($_POST['edit_company'])) {
 
-    require_once('post/setting_company_model.php');
-
     validateAdminRole();
 
+    require_once('post/setting_company_model.php');
+
     $sql = mysqli_query($mysqli,"SELECT company_logo FROM companies WHERE company_id = 1");
     $row = mysqli_fetch_array($sql);
     $existing_file_name = sanitizeInput($row['company_logo']);
@@ -56,11 +56,14 @@ if (isset($_POST['edit_localization'])) {
 
     $locale = sanitizeInput($_POST['locale']);
     $currency_code = sanitizeInput($_POST['currency_code']);
+    $timezone = sanitizeInput($_POST['timezone']);
 
     mysqli_query($mysqli,"UPDATE companies SET company_locale = '$locale', company_currency = '$currency_code' WHERE company_id = 1");
 
+    mysqli_query($mysqli,"UPDATE settings SET config_timezone = '$timezone' WHERE company_id = 1");
+
     //Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Company', log_action = 'Edit', log_description = '$session_name edited company $name localization settings', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Company', log_action = 'Edit', log_description = '$session_name edited company localization settings', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
 
     $_SESSION['alert_message'] = "Company localization updated";
 
diff --git a/settings_localization.php b/settings_localization.php
index 2d8b0ff3..67fbc2f3 100644
--- a/settings_localization.php
+++ b/settings_localization.php
@@ -4,10 +4,12 @@ require_once("inc_all_settings.php");
 $sql = mysqli_query($mysqli,"SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id AND companies.company_id = 1");
 
 $row = mysqli_fetch_array($sql);
-$company_id = intval($row['company_id']);
 $company_locale = nullable_htmlentities($row['company_locale']);
 $company_currency = nullable_htmlentities($row['company_currency']);
 
+// Get a list of all available timezones
+$timezones = DateTimeZone::listIdentifiers();
+
 ?>
 
     <div class="card card-dark">
@@ -47,6 +49,21 @@ $company_currency = nullable_htmlentities($row['company_currency']);
                     </div>
                 </div>
 
+                <div class="form-group">
+                    <label>Timezone <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-business-time"></i></span>
+                        </div>
+                        <select class="form-control select2" name="timezone" required>
+                            <option value="">- Select a Timezone -</option>
+                            <?php foreach ($timezones as $tz) { ?>
+                                <option <?php if ($config_timezone == $tz) { echo "selected"; } ?> value="<?php echo $tz; ?>"><?php echo $tz; ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
                 <hr>
 
                 <button type="submit" name="edit_localization" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>