diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index 9097d555..99595b71 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -3449,53 +3449,28 @@ $modsForHesk_settings = mfh_getSettings();
             <div class="box-body">
                 <h4 class="bold"><?php echo $hesklang['dat']; ?></h4>
                 <div class="form-group">
-                    <label for="servertime" class="col-sm-4 control-label"><?php echo $hesklang['server_time']; ?>
-                        <a href="Javascript:void(0)"
-                           onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#18','400','500')"><i
-                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                    <label for="s_timezone" class="col-sm-4 control-label"><?php echo $hesklang['TZ']; ?> <a
+                                href="Javascript:void(0)"
+                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#63','400','500')"><i
+                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
                     <div class="col-sm-8">
-                        <p class="form-control-static"><?php echo $hesklang['csrt'] . ' <span id="servertime">' . $server_time . '</span>'; ?></p>
-                        <script language="javascript" type="text/javascript"><!--
-                            startTime();
-                            //-->
-                        </script>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <div class="row">
-                        <div class="col-sm-2 col-sm-offset-4">
-                            <input type="text" class="form-control" name="s_diff_hours" size="5" maxlength="3"
-                                   value="<?php echo $hesk_settings['diff_hours']; ?>"/>
-                        </div>
-                        <div class="col-sm-6 pad-right-0">
-                            <p class="form-control-static"><?php echo $hesklang['t_h']; ?></p>
-                        </div>
-                    </div>
-                    <div class="row pad-right-0">
-                        <div class="col-sm-2 col-sm-offset-4">
-                            <input type="text" class="form-control" name="s_diff_minutes" size="5" maxlength="3"
-                                   value="<?php echo $hesk_settings['diff_minutes']; ?>"/>
-                        </div>
-                        <div class="col-sm-6 pad-right-0">
-                            <p class="form-control-static"><?php echo $hesklang['t_m']; ?></p>
-                        </div>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label for="s_daylight" class="col-sm-4 control-label"><?php echo $hesklang['day']; ?> <a
-                            href="Javascript:void(0)"
-                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#19','400','500')"><i
-                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                    <div class="col-sm-8 form-inline">
                         <?php
-                        $on = $hesk_settings['daylight'] ? 'checked="checked"' : '';
-                        $off = $hesk_settings['daylight'] ? '' : 'checked="checked"';
-                        echo '
-                        <div class="radio"><label><input type="radio" name="s_daylight" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
-                        <div class="radio"><label><input type="radio" name="s_daylight" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
+                        // Get list of supported timezones
+                        $timezone_list = hesk_generate_timezone_list();
+
+                        // Do we need to localize month names?
+                        if ($hesk_settings['language'] != 'English') {
+                            $timezone_list = hesk_translate_timezone_list($timezone_list);
+                        }
                         ?>
+                        <select class="form-control" name="s_timezone">
+                            <?php foreach ($timezone_list as $timezone => $description): ?>
+                                <option value="<?php echo $timezone; ?>" <?php if ($hesk_settings['timezone'] == $timezone) {echo 'selected';} ?>>
+                                    <?php echo $description; ?>
+                                </option>
+                            <?php endforeach; ?>
+                        </select>
                     </div>
                 </div>
                 <div class="form-group">
diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php
index cd6c96cf..2a63cee4 100644
--- a/admin/admin_settings_save.php
+++ b/admin/admin_settings_save.php
@@ -419,9 +419,10 @@ $set['updatedformat'] = hesk_checkMinMax(intval(hesk_POST('s_updatedformat')), 0
 /*** MISC ***/
 
 /* --> Date & Time */
-$set['diff_hours'] = floatval(hesk_POST('s_diff_hours', 0));
-$set['diff_minutes'] = floatval(hesk_POST('s_diff_minutes', 0));
-$set['daylight'] = empty($_POST['s_daylight']) ? 0 : 1;
+$set['timezone'] = hesk_input(hesk_POST('s_timezone'));
+if (!in_array($set['timezone'], timezone_identifiers_list())) {
+    $set['timezone'] = 'UTC';
+}
 $set['timeformat'] = hesk_input(hesk_POST('s_timeformat')) or $set['timeformat'] = 'Y-m-d H:i:s';
 
 /* --> Other */
@@ -881,9 +882,7 @@ $hesk_settings[\'updatedformat\']=' . $set['updatedformat'] . ';
 // ==> MISC
 
 // --> Date & Time
-$hesk_settings[\'diff_hours\']=' . $set['diff_hours'] . ';
-$hesk_settings[\'diff_minutes\']=' . $set['diff_minutes'] . ';
-$hesk_settings[\'daylight\']=' . $set['daylight'] . ';
+$hesk_settings[\'timezone\']=\'' . $set['timezone'] . '\';
 $hesk_settings[\'timeformat\']=\'' . $set['timeformat'] . '\';
 
 // --> Other