diff --git a/application/views/backend/users.php b/application/views/backend/users.php
index 7eaa472d..c3a1ea33 100755
--- a/application/views/backend/users.php
+++ b/application/views/backend/users.php
@@ -242,7 +242,7 @@
                             <h3><?= lang('working_plan') ?></h3>
                             <button id="reset-working-plan" class="btn btn-primary"
                                     title="<?= lang('reset_working_plan') ?>">
-                                <i class="fas fa-redo-alt"></i>
+                                <i class="fas fa-redo-alt mr-2"></i>
                                 <?= lang('reset_plan') ?></button>
                             <table class="working-plan table table-striped mt-2">
                                 <thead>
@@ -265,7 +265,7 @@
 
                             <div>
                                 <button type="button" class="add-break btn btn-primary">
-                                    <i class="far fa-plus-square"></i>
+                                    <i class="far fa-plus-square mr-2"></i>
                                     <?= lang('add_break') ?>
                                 </button>
                             </div>
@@ -293,7 +293,7 @@
                         </span>
 
                             <div>
-                                <button type="button" class="add-extra-periods btn btn-primary">
+                                <button type="button" class="add-extra-periods btn btn-primary mr-2">
                                     <i class="far fa-plus-square"></i>
                                     <?= lang('add_extra_period') ?>
                                 </button>
diff --git a/assets/js/backend_users.js b/assets/js/backend_users.js
index cc8f77a3..de236c80 100644
--- a/assets/js/backend_users.js
+++ b/assets/js/backend_users.js
@@ -72,13 +72,16 @@ window.BackendUsers = window.BackendUsers || {};
                             $('<input/>', {
                                 'class': 'form-check-input',
                                 'type': 'checkbox',
-                                'data-id': service.id
+                                'data-id': service.id,
+                                'prop': {
+                                    'disabled': true
+                                }
                             }),
                             $('<label/>', {
                                 'class': 'form-check-label',
                                 'text': service.name,
                                 'for': service.id
-                            }),
+                            })
                         ]
                     })
                 ]
@@ -102,7 +105,7 @@ window.BackendUsers = window.BackendUsers || {};
                                 'class': 'form-check-label',
                                 'text': provider.first_name + ' ' + provider.last_name,
                                 'for': provider.id
-                            }),
+                            })
                         ]
                     })
                 ]
diff --git a/assets/js/backend_users_providers.js b/assets/js/backend_users_providers.js
index 9e3a9ffa..d08389f5 100755
--- a/assets/js/backend_users_providers.js
+++ b/assets/js/backend_users_providers.js
@@ -84,10 +84,8 @@
             $('#filter-providers .results').css('color', '#AAA');
             $('#providers .add-edit-delete-group').hide();
             $('#providers .save-cancel-group').show();
-            $('#providers .record-details').find('input, textarea').prop('disabled', false);
-            $('#providers .record-details').find('select').prop('disabled', false);
+            $('#providers .record-details').find('input, select, textarea').prop('disabled', false);
             $('#provider-password, #provider-password-confirm').addClass('required');
-            $('#provider-notifications').prop('disabled', false);
             $('#providers').find('.add-break, .edit-break, .delete-break, .add-extra-periods, .edit-extra, .delete-extra, #reset-working-plan').prop('disabled', false);
             $('#provider-services input:checkbox').prop('disabled', false);
 
@@ -104,8 +102,7 @@
             $('#providers .save-cancel-group').show();
             $('#filter-providers button').prop('disabled', true);
             $('#filter-providers .results').css('color', '#AAA');
-            $('#providers .record-details').find('input, textarea').prop('disabled', false);
-            $('#providers .record-details').find('select').prop('disabled', false);
+            $('#providers .record-details').find('input, select, textarea').prop('disabled', false);
             $('#provider-password, #provider-password-confirm').removeClass('required');
             $('#provider-notifications').prop('disabled', false);
             $('#provider-services input:checkbox').prop('disabled', false);
@@ -331,12 +328,10 @@
         $('#providers .add-edit-delete-group').show();
         $('#providers .save-cancel-group').hide();
         $('#providers .record-details h3 a').remove();
-        $('#providers .record-details').find('input, textarea').prop('disabled', true);
-        $('#providers .record-details').find('select').prop('disabled', true);
+        $('#providers .record-details').find('input, select, textarea')
+            .val('')
+            .prop('disabled', true);
         $('#providers .form-message').hide();
-        $('#provider-notifications').removeClass('active');
-        $('#provider-notifications').prop('disabled', true);
-        $('#provider-services input:checkbox').prop('disabled', true);
         $('#providers .add-break, .add-extra-periods, #reset-working-plan').prop('disabled', true);
         BackendUsers.wp.timepickers(true);
         $('#providers .working-plan input:text').timepicker('destroy');
@@ -347,8 +342,9 @@
         $('#providers .has-error').removeClass('has-error');
 
         $('#edit-provider, #delete-provider').prop('disabled', true);
-        $('#providers .record-details').find('input, textarea').val('');
-        $('#provider-services input:checkbox').prop('checked', false);
+        $('#provider-services input:checkbox')
+            .prop('disabled', true)
+            .prop('checked', false);
         $('#provider-services a').remove();
         $('#providers .working-plan tbody').empty();
         $('#providers .breaks tbody').empty();
@@ -426,12 +422,14 @@
         // Display working plan
         var workingPlan = $.parseJSON(provider.settings.working_plan);
         BackendUsers.wp.setup(workingPlan);
+        $('.working-plan').find('input').prop('disabled', true);
         $('.breaks').find('.edit-break, .delete-break').prop('disabled', true);
         $('#providers .extra-periods tbody').empty();
         var extraWorkingPlan = $.parseJSON(provider.settings.extra_working_plan);
         BackendUsers.wp.setupExtraPeriods(extraWorkingPlan);
         $('.extra-periods').find('.edit-extra, .delete-extra').prop('disabled', true);
         $('#providers .working-plan input:checkbox').prop('disabled', true);
+        Backend.placeFooterToBottom();
     };
 
     /**
diff --git a/assets/js/backend_users_secretaries.js b/assets/js/backend_users_secretaries.js
index 830a8888..fdb7000d 100644
--- a/assets/js/backend_users_secretaries.js
+++ b/assets/js/backend_users_secretaries.js
@@ -90,7 +90,6 @@
             $('#secretaries .record-details').find('input, textarea').prop('disabled', false);
             $('#secretaries .record-details').find('select').prop('disabled', false);
             $('#secretary-password, #secretary-password-confirm').addClass('required');
-            $('#secretary-notifications').prop('disabled', false);
             $('#secretary-providers input:checkbox').prop('disabled', false);
         }.bind(this));
 
@@ -105,7 +104,6 @@
             $('#secretaries .record-details').find('input, textarea').prop('disabled', false);
             $('#secretaries .record-details').find('select').prop('disabled', false);
             $('#secretary-password, #secretary-password-confirm').removeClass('required');
-            $('#secretary-notifications').prop('disabled', false);
             $('#secretary-providers input:checkbox').prop('disabled', false);
         });
 
@@ -152,7 +150,7 @@
                 timezone: $('#secretary-timezone').val(),
                 settings: {
                     username: $('#secretary-username').val(),
-                    notifications: $('#secretary-notifications').hasClass('active'),
+                    notifications: $('#secretary-notifications').prop('checked'),
                     calendar_view: $('#secretary-calendar-view').val()
                 }
             };
@@ -303,17 +301,14 @@
      * Resets the secretary tab form back to its initial state.
      */
     SecretariesHelper.prototype.resetForm = function () {
-        $('#secretaries .record-details').find('input, textarea').val('');
+        $('#secretaries .record-details').find('input, select, textarea')
+            .val('')
+            .prop('disabled', true);
         $('#secretaries .add-edit-delete-group').show();
         $('#secretaries .save-cancel-group').hide();
         $('#edit-secretary, #delete-secretary').prop('disabled', true);
-        $('#secretaries .record-details').find('input, textarea').prop('disabled', true);
-        $('#secretaries .record-details').find('select').prop('disabled', true);
         $('#secretaries .form-message').hide();
-        $('#secretary-notifications').removeClass('active');
-        $('#secretary-notifications').prop('disabled', true);
         $('#secretary-providers input:checkbox').prop('checked', false);
-        $('#secretary-providers input:checkbox').prop('disabled', true);
         $('#secretaries .has-error').removeClass('has-error');
 
         $('#filter-secretaries .selected').removeClass('selected');
diff --git a/assets/js/working_plan.js b/assets/js/working_plan.js
index 9c9d0c83..6cf88541 100755
--- a/assets/js/working_plan.js
+++ b/assets/js/working_plan.js
@@ -475,7 +475,7 @@
             // Make all cells in current row editable.
             $(this).parent().parent().children().trigger('edit');
             $(this).parent().parent().find('.break-start input, .break-end input').timepicker({
-                timeFormat: GlobalVariables.timeFormat === 'regular' ? 'h:mm tt' : 'HH:mm',
+                timeFormat: GlobalVariables.timeFormat === 'regular' ? 'h:mm TT' : 'HH:mm',
                 currentText: EALang.now,
                 closeText: EALang.close,
                 timeOnlyTitle: EALang.select_time,
@@ -649,7 +649,7 @@
             // Make all cells in current row editable.
             $(this).parent().parent().children().trigger('edit');
             $(this).parent().parent().find('.extra-start input, .extra-end input').timepicker({
-                timeFormat: GlobalVariables.timeFormat === 'regular' ? 'h:mm tt' : 'HH:mm',
+                timeFormat: GlobalVariables.timeFormat === 'regular' ? 'h:mm TT' : 'HH:mm',
                 currentText: EALang.now,
                 closeText: EALang.close,
                 timeOnlyTitle: EALang.select_time,
@@ -840,7 +840,7 @@
         if (disabled === false) {
             // Set timepickers where needed.
             $('.working-plan input:text').timepicker({
-                timeFormat: GlobalVariables.timeFormat === 'regular' ? 'h:mm tt' : 'HH:mm',
+                timeFormat: GlobalVariables.timeFormat === 'regular' ? 'h:mm TT' : 'HH:mm',
                 currentText: EALang.now,
                 closeText: EALang.close,
                 timeOnlyTitle: EALang.select_time,