diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php
index 77ec1668..5df75af1 100644
--- a/admin/admin_settings_save.php
+++ b/admin/admin_settings_save.php
@@ -497,6 +497,9 @@ $set['statuses_order_column'] = empty($_POST['statuses_order_column']) ? 'sort'
$set['kb_attach_dir'] = hesk_POST('kb_attach_dir', 'attachments');
$set['display_user_agent_information'] = empty($_POST['display_user_agent_information']) ? 0 : 1;
$set['navbar_title_url'] = hesk_POST('navbar_title_url');
+$set['enable_calendar'] = hesk_checkMinMax(intval(hesk_POST('enable_calendar')), 0, 2, 2);
+$set['first_day_of_week'] = hesk_POST('first-day-of-week', 0);
+$set['default_view'] = hesk_POST('default-view', 'month');
if ($set['customer-email-verification-required']) {
//-- Don't allow multiple emails if verification is required
@@ -544,6 +547,9 @@ mfh_updateSetting('navbar_title_url', $set['navbar_title_url'], true);
mfh_updateSetting('mailgun_api_key', $set['mailgun_api_key'], true);
mfh_updateSetting('mailgun_domain', $set['mailgun_domain'], true);
mfh_updateSetting('use_mailgun', $set['use_mailgun'], false);
+mfh_updateSetting('enable_calendar', $set['enable_calendar'], false);
+mfh_updateSetting('first_day_of_week', $set['first_day_of_week'], false);
+mfh_updateSetting('default_calendar_view', $set['default_view'], true);
// Prepare settings file and save it
$settings_file_content = 'YES, enable calendar';
$hesklang['yes_enable_calendar_staff_only'] = 'YES, enable calendar, but only for staff';
$hesklang['no_disable_calendar'] = 'NO, disable calendar';
$hesklang['first_day_of_week'] = 'First day of week';
+$hesklang['first_day_of_week_help'] = 'This setting decides which day of the week to show first per week.';
$hesklang['calendar_disabled'] = 'The calendar is disabled';
+$hesklang['default_view'] = 'Default view';
+$hesklang['default_view_help'] = 'Decide which view will be shown to customers and staff by default when viewing the calendar. Staff can change this setting via their own profile.';
+$hesklang['week'] = 'Week';
+$hesklang['agenda'] = 'Agenda';
// ADDED OR MODIFIED IN Mods for HESK 2.5.2
$hesklang['manage_statuses'] = 'Manage Statuses';