diff --git a/src/application/views/backend/settings.php b/src/application/views/backend/settings.php
index 8f34fd2d..cd03e254 100644
--- a/src/application/views/backend/settings.php
+++ b/src/application/views/backend/settings.php
@@ -180,6 +180,18 @@
                                     </tr>
                                 </thead>
                                 <tbody>
+                                    <tr>
+                                        <td>
+                                            <div class="checkbox">
+                                                <label>
+                                                    <input type="checkbox" id="sunday">
+                                                    <?= lang('sunday') ?>
+                                                </label>
+                                            </div>
+                                        </td>
+                                        <td><input id="sunday-start" class="work-start form-control input-sm"></td>
+                                        <td><input id="sunday-end" class="work-end form-control input-sm"></td>
+                                    </tr>
                                     <tr>
                                         <td>
                                             <div class="checkbox">
@@ -252,18 +264,6 @@
                                         <td><input id="saturday-start" class="work-start form-control input-sm"></td>
                                         <td><input id="saturday-end" class="work-end form-control input-sm"></td>
                                     </tr>
-                                    <tr>
-                                        <td>
-                                            <div class="checkbox">
-                                                <label>
-                                                    <input type="checkbox" id="sunday">
-                                                    <?= lang('sunday') ?>
-                                                </label>
-                                            </div>
-                                        </td>
-                                        <td><input id="sunday-start" class="work-start form-control input-sm"></td>
-                                        <td><input id="sunday-end" class="work-end form-control input-sm"></td>
-                                    </tr>
                                 </tbody>
                             </table>
 
diff --git a/src/application/views/backend/users.php b/src/application/views/backend/users.php
index a72df49e..86275db9 100644
--- a/src/application/views/backend/users.php
+++ b/src/application/views/backend/users.php
@@ -366,6 +366,18 @@
                                 </tr>
                             </thead>
                             <tbody>
+                                <tr>
+                                    <td>
+                                        <div class="checkbox">
+                                            <label>
+                                                <input type="checkbox" id="sunday">
+                                                <?= lang('sunday') ?>
+                                            </label>
+                                        </div>
+                                    </td>
+                                    <td><input id="sunday-start" class="work-start form-control input-sm"></td>
+                                    <td><input id="sunday-end" class="work-end form-control input-sm"></td>
+                                </tr>
                                 <tr>
                                     <td>
                                         <div class="checkbox">
@@ -438,18 +450,6 @@
                                     <td><input id="saturday-start" class="work-start form-control input-sm"></td>
                                     <td><input id="saturday-end" class="work-end form-control input-sm"></td>
                                 </tr>
-                                <tr>
-                                    <td>
-                                        <div class="checkbox">
-                                            <label>
-                                                <input type="checkbox" id="sunday">
-                                                <?= lang('sunday') ?>
-                                            </label>
-                                        </div>
-                                    </td>
-                                    <td><input id="sunday-start" class="work-start form-control input-sm"></td>
-                                    <td><input id="sunday-end" class="work-end form-control input-sm"></td>
-                                </tr>
                             </tbody>
                         </table>
 
diff --git a/src/assets/js/backend_calendar_appointments_modal.js b/src/assets/js/backend_calendar_appointments_modal.js
index b5b0d363..6e419f92 100644
--- a/src/assets/js/backend_calendar_appointments_modal.js
+++ b/src/assets/js/backend_calendar_appointments_modal.js
@@ -413,7 +413,7 @@ window.BackendCalendarAppointmentsModal = window.BackendCalendarAppointmentsModa
             timeText: EALang.time,
             hourText: EALang.hour,
             minuteText: EALang.minutes,
-            firstDay: 1
+            firstDay: 0
         });
         $dialog.find('#start-datetime').datetimepicker('setDate', startDatetime);
 
@@ -443,7 +443,7 @@ window.BackendCalendarAppointmentsModal = window.BackendCalendarAppointmentsModa
             timeText: EALang.time,
             hourText: EALang.hour,
             minuteText: EALang.minutes,
-            firstDay: 1
+            firstDay: 0
         });
         $dialog.find('#end-datetime').datetimepicker('setDate', endDatetime);
     };
diff --git a/src/assets/js/backend_calendar_default_view.js b/src/assets/js/backend_calendar_default_view.js
index b9d0e651..33c6687d 100644
--- a/src/assets/js/backend_calendar_default_view.js
+++ b/src/assets/js/backend_calendar_default_view.js
@@ -1050,7 +1050,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
             defaultView: defaultView,
             height: _getCalendarHeight(),
             editable: true,
-            firstDay: 1, // Monday
+            firstDay: 0,
             snapDuration: '00:30:00',
             timeFormat: 'h:mm A',
             slotLabelFormat : 'h(:mm) A',
diff --git a/src/assets/js/backend_calendar_unavailabilities_modal.js b/src/assets/js/backend_calendar_unavailabilities_modal.js
index 115e36dd..0784291b 100644
--- a/src/assets/js/backend_calendar_unavailabilities_modal.js
+++ b/src/assets/js/backend_calendar_unavailabilities_modal.js
@@ -207,7 +207,7 @@ window.BackendCalendarUnavailabilitiesModal = window.BackendCalendarUnavailabili
             timeText: EALang.time,
             hourText: EALang.hour,
             minuteText: EALang.minutes,
-            firstDay: 1
+            firstDay: 0
         });
         $dialog.find('#unavailable-start').val(start);
 
@@ -237,7 +237,7 @@ window.BackendCalendarUnavailabilitiesModal = window.BackendCalendarUnavailabili
             timeText: EALang.time,
             hourText: EALang.hour,
             minuteText: EALang.minutes,
-            firstDay: 1
+            firstDay: 0
         });
         $dialog.find('#unavailable-end').val(end);
 
diff --git a/src/assets/js/frontend_book.js b/src/assets/js/frontend_book.js
index f20ab148..4893606b 100644
--- a/src/assets/js/frontend_book.js
+++ b/src/assets/js/frontend_book.js
@@ -62,7 +62,7 @@ window.FrontendBook = window.FrontendBook || {};
 
         $('#select-date').datepicker({
             dateFormat: 'dd-mm-yy',
-            firstDay: 1, // Monday
+            firstDay: 0,
             minDate: 0,
             defaultDate: Date.today(),
 
diff --git a/src/assets/js/working_plan.js b/src/assets/js/working_plan.js
index 701c9c12..77b7d794 100644
--- a/src/assets/js/working_plan.js
+++ b/src/assets/js/working_plan.js
@@ -98,13 +98,13 @@
      */
     WorkingPlan.prototype.editableBreakDay = function($selector) {
         var weekDays = {};
+        weekDays[EALang.sunday] = EALang.sunday; //'Sunday';
         weekDays[EALang.monday] = EALang.monday; //'Monday';
         weekDays[EALang.tuesday] = EALang.tuesday; //'Tuesday';
         weekDays[EALang.wednesday] = EALang.wednesday; //'Wednesday';
         weekDays[EALang.thursday] = EALang.thursday; //'Thursday';
         weekDays[EALang.friday] = EALang.friday; //'Friday';
         weekDays[EALang.saturday] = EALang.saturday; //'Saturday';
-        weekDays[EALang.sunday] = EALang.sunday; //'Sunday';
 
         $selector.editable(function(value, settings) {
             return value;
@@ -396,6 +396,8 @@
      */
     WorkingPlan.prototype.convertValueToDay = function(value) {
         switch (value) {
+            case 'sunday':
+                return EALang.sunday;
             case 'monday':
                 return EALang.monday;
             case 'tuesday':
@@ -408,8 +410,6 @@
                 return EALang.friday;
             case 'saturday':
                 return EALang.saturday;
-            case 'sunday':
-                return EALang.sunday;
         }
     };
 
@@ -420,6 +420,8 @@
      */
     WorkingPlan.prototype.convertDayToValue = function(day) {
         switch (day) {
+            case EALang.sunday:
+                return 'sunday';
             case EALang.monday:
                 return 'monday';
             case EALang.tuesday:
@@ -432,8 +434,6 @@
                 return 'friday';
             case EALang.saturday:
                 return 'saturday';
-            case EALang.sunday:
-                return 'sunday';
         }
     };
 
diff --git a/src/assets/sql/data.sql b/src/assets/sql/data.sql
index 9905258e..b38b7b19 100644
--- a/src/assets/sql/data.sql
+++ b/src/assets/sql/data.sql
@@ -10,7 +10,7 @@ INSERT INTO
     `ea_settings` (`name`, `value`)
 VALUES
     ('company_working_plan',
-     '{"monday":{"start":"09:00","end":"18:00","breaks":[{"start":"11:20","end":"11:30"},{"start":"14:30","end":"15:00"}]},"tuesday":{"start":"09:00","end":"18:00","breaks":[{"start":"11:20","end":"11:30"},{"start":"14:30","end":"15:00"}]},"wednesday":{"start":"09:00","end":"18:00","breaks":[{"start":"11:20","end":"11:30"},{"start":"14:30","end":"15:00"}]},"thursday":{"start":"09:00","end":"18:00","breaks":[{"start":"11:20","end":"11:30"},{"start":"14:30","end":"15:00"}]},"friday":{"start":"09:00","end":"18:00","breaks":[{"start":"11:20","end":"11:30"},{"start":"14:30","end":"15:00"}]},"saturday":{"start":"09:00","end":"18:00","breaks":[{"start":"11:20","end":"11:30"},{"start":"14:30","end":"15:00"}]},"sunday":{"start":"09:00","end":"18:00","breaks":[{"start":"11:20","end":"11:30"},{"start":"14:30","end":"15:00"}]}}'),
+     '{"sunday":{"start":"09:00","end":"18:00","breaks":[{"start":"11:20","end":"11:30"},{"start":"14:30","end":"15:00"}]},"monday":{"start":"09:00","end":"18:00","breaks":[{"start":"11:20","end":"11:30"},{"start":"14:30","end":"15:00"}]},"tuesday":{"start":"09:00","end":"18:00","breaks":[{"start":"11:20","end":"11:30"},{"start":"14:30","end":"15:00"}]},"wednesday":{"start":"09:00","end":"18:00","breaks":[{"start":"11:20","end":"11:30"},{"start":"14:30","end":"15:00"}]},"thursday":{"start":"09:00","end":"18:00","breaks":[{"start":"11:20","end":"11:30"},{"start":"14:30","end":"15:00"}]},"friday":{"start":"09:00","end":"18:00","breaks":[{"start":"11:20","end":"11:30"},{"start":"14:30","end":"15:00"}]},"saturday":{"start":"09:00","end":"18:00","breaks":[{"start":"11:20","end":"11:30"},{"start":"14:30","end":"15:00"}]}}'),
     ('book_advance_timeout', '30'),
     ('google_analytics_code', ''),
     ('customer_notifications', '1'),