diff --git a/src/application/config/migration.php b/src/application/config/migration.php
old mode 100644
new mode 100755
index 5f8c03eb..988cc798
--- a/src/application/config/migration.php
+++ b/src/application/config/migration.php
@@ -37,7 +37,7 @@ $config['migration_table'] = 'ea_migrations';
 | be upgraded / downgraded to.
 |
 */
-$config['migration_version'] = 13; // current
+$config['migration_version'] = 14; // current
 
 
 /*
diff --git a/src/application/controllers/Appointments.php b/src/application/controllers/Appointments.php
index 498652be..1b5fca56 100755
--- a/src/application/controllers/Appointments.php
+++ b/src/application/controllers/Appointments.php
@@ -810,6 +810,9 @@ class Appointments extends CI_Controller {
         // Get the service, provider's working plan and provider appointments.
         $working_plan = json_decode($this->providers_model->get_setting('working_plan', $provider_id), TRUE);
 
+        // Get the provider's extra working plan.
+        $extra_working_plan = json_decode($this->providers_model->get_setting('extra_working_plan', $provider_id), TRUE);
+
         $provider_appointments = $this->appointments_model->get_batch([
             'id_users_provider' => $provider_id,
         ]);
@@ -831,6 +834,14 @@ class Appointments extends CI_Controller {
         // every reserved appointment is considered to be a taken space in the plan.
         $selected_date_working_plan = $working_plan[strtolower(date('l', strtotime($selected_date)))];
 
+        // Search if the $selected_date is an extra date added outside the normal working plan
+        if ($selected_date_working_plan == null) {
+            if (isset($extra_working_plan[strtolower(date('Y-m-d', strtotime($selected_date)))])){
+                $selected_date_working_plan = $extra_working_plan[strtolower(date('Y-m-d', strtotime($selected_date)))];
+            }
+        }
+
+
         $periods = [];
 
         if (isset($selected_date_working_plan['breaks']))
diff --git a/src/application/controllers/Backend.php b/src/application/controllers/Backend.php
index 71ee1319..4f226fdf 100755
--- a/src/application/controllers/Backend.php
+++ b/src/application/controllers/Backend.php
@@ -224,6 +224,7 @@ class Backend extends CI_Controller {
         $view['secretaries'] = $this->secretaries_model->get_batch();
         $view['services'] = $this->services_model->get_batch();
         $view['working_plan'] = $this->settings_model->get_setting('company_working_plan');
+        $view['extra_working_plan'] = "{}";
         $this->set_user_data($view);
 
         $this->load->view('backend/header', $view);
diff --git a/src/application/controllers/Backend_api.php b/src/application/controllers/Backend_api.php
index e44e24be..1ed668c4 100755
--- a/src/application/controllers/Backend_api.php
+++ b/src/application/controllers/Backend_api.php
@@ -798,6 +798,101 @@ class Backend_api extends CI_Controller {
         }
     }
 
+    /**
+     * [AJAX] Insert of update extra working plan time period to database.
+     *
+     * Required POST Parameters:
+     *
+     * - array $_POST['extra_period'] JSON encoded array that contains the unavailable period data.
+     */
+    public function ajax_save_extra_period()
+    {
+        try
+        {
+            // Check privileges
+            $extra_period = json_decode($this->input->post('extra_period'), TRUE);
+
+            $REQUIRED_PRIV = ( ! isset($extra_period['id']))
+                ? $this->privileges[PRIV_APPOINTMENTS]['add']
+                : $this->privileges[PRIV_APPOINTMENTS]['edit'];
+            if ($REQUIRED_PRIV == FALSE)
+            {
+                throw new Exception('You do not have the required privileges for this task.');
+            }
+
+            $this->load->model('providers_model');
+
+            $success = $this->providers_model->set_extra_working_day($extra_period, $extra_period['id_users_provider']);
+
+            if ( ! $success)
+            {
+                $this->output
+                    ->set_content_type('application/json')
+                    ->set_output(json_encode(['warnings' => 'Error on saving extra period.']));
+            }
+            else
+            {
+                $this->output
+                    ->set_content_type('application/json')
+                    ->set_output(json_encode(AJAX_SUCCESS));
+            }
+        }
+        catch (Exception $exc)
+        {
+            $this->output
+                ->set_content_type('application/json')
+                ->set_output(json_encode(['exceptions' => [exceptionToJavaScript($exc)]]));
+        }
+    }
+
+    /**
+     * [AJAX] Delete an extra working plan time period to database.
+     *
+     * Required POST Parameters:
+     *
+     * - String $_POST['extra_period'] Date to be deleted.
+     * - int $_POST['provider_id'] Record id to be deleted.
+     */
+    public function ajax_delete_extra_period()
+    {
+        try
+        {
+            if ($this->privileges[PRIV_APPOINTMENTS]['delete'] == FALSE)
+            {
+                throw new Exception('You do not have the required privileges for this task.');
+            }
+
+            // Check privileges
+            $extra_period = $this->input->post('extra_period');
+            $provider_id = $this->input->post('provider_id');
+
+            $this->load->model('providers_model');
+
+            // Delete unavailable
+            $success = $this->providers_model->delete_extra_working_day($extra_period, $provider_id);
+
+            if ( ! $success)
+            {
+                $this->output
+                    ->set_content_type('application/json')
+                    ->set_output(json_encode(['warnings' => 'Error on deleting extra working day']));
+            }
+            else
+            {
+                $this->output
+                    ->set_content_type('application/json')
+                    ->set_output(json_encode(AJAX_SUCCESS));
+            }
+
+        } //
+        catch (Exception $exc) //
+        { //
+            $this->output //
+                ->set_content_type('application/json') //
+                ->set_output(json_encode(['exceptions' => [exceptionToJavaScript($exc)]])); //
+        }//
+    } //
+
     /**
      * [AJAX] Save (insert or update) a customer record.
      *
diff --git a/src/application/language/arabic/translations_lang.php b/src/application/language/arabic/translations_lang.php
index 641ad909..066f9acf 100755
--- a/src/application/language/arabic/translations_lang.php
+++ b/src/application/language/arabic/translations_lang.php
@@ -298,3 +298,10 @@ $lang['delete_personal_information_hint'] = 'Delete all personal information fro
 $lang['delete_personal_information'] = 'Delete Personal Information';
 $lang['delete_personal_information_prompt'] = 'Are you sure that you want to delete your personal information? This action cannot be undone.';
 $lang['location'] = 'Location';
+$lang['extra_period'] = '';
+$lang['extra_periods'] = '';
+$lang['extra_periods_hint'] = '';
+$lang['new_extra_period_title'] = '';
+$lang['extra_period_saved'] = '';
+$lang['add_extra_periods_during_each_day'] = '';
+$lang['add_extra_period'] = '';
diff --git a/src/application/language/bulgarian/translations_lang.php b/src/application/language/bulgarian/translations_lang.php
index 38e182c3..1300275f 100755
--- a/src/application/language/bulgarian/translations_lang.php
+++ b/src/application/language/bulgarian/translations_lang.php
@@ -298,3 +298,10 @@ $lang['delete_personal_information_hint'] = 'Delete all personal information fro
 $lang['delete_personal_information'] = 'Delete Personal Information';
 $lang['delete_personal_information_prompt'] = 'Are you sure that you want to delete your personal information? This action cannot be undone.';
 $lang['location'] = 'Location';
+$lang['extra_period'] = '';
+$lang['extra_periods'] = '';
+$lang['extra_periods_hint'] = '';
+$lang['new_extra_period_title'] = '';
+$lang['extra_period_saved'] = '';
+$lang['add_extra_periods_during_each_day'] = '';
+$lang['add_extra_period'] = '';
diff --git a/src/application/language/chinese/translations_lang.php b/src/application/language/chinese/translations_lang.php
index 7302958d..9b72d7ba 100755
--- a/src/application/language/chinese/translations_lang.php
+++ b/src/application/language/chinese/translations_lang.php
@@ -298,3 +298,10 @@ $lang['delete_personal_information_hint'] = 'Delete all personal information fro
 $lang['delete_personal_information'] = 'Delete Personal Information';
 $lang['delete_personal_information_prompt'] = 'Are you sure that you want to delete your personal information? This action cannot be undone.';
 $lang['location'] = 'Location';
+$lang['extra_period'] = '';
+$lang['extra_periods'] = '';
+$lang['extra_periods_hint'] = '';
+$lang['new_extra_period_title'] = '';
+$lang['extra_period_saved'] = '';
+$lang['add_extra_periods_during_each_day'] = '';
+$lang['add_extra_period'] = '';
diff --git a/src/application/language/danish/translations_lang.php b/src/application/language/danish/translations_lang.php
index 0d301b9b..c589c46d 100755
--- a/src/application/language/danish/translations_lang.php
+++ b/src/application/language/danish/translations_lang.php
@@ -298,3 +298,10 @@ $lang['delete_personal_information_hint'] = 'Delete all personal information fro
 $lang['delete_personal_information'] = 'Delete Personal Information';
 $lang['delete_personal_information_prompt'] = 'Are you sure that you want to delete your personal information? This action cannot be undone.';
 $lang['location'] = 'Location';
+$lang['extra_period'] = '';
+$lang['extra_periods'] = '';
+$lang['extra_periods_hint'] = '';
+$lang['new_extra_period_title'] = '';
+$lang['extra_period_saved'] = '';
+$lang['add_extra_periods_during_each_day'] = '';
+$lang['add_extra_period'] = '';
diff --git a/src/application/language/dutch/translations_lang.php b/src/application/language/dutch/translations_lang.php
index e9b0cdc7..9478872e 100755
--- a/src/application/language/dutch/translations_lang.php
+++ b/src/application/language/dutch/translations_lang.php
@@ -298,3 +298,10 @@ $lang['delete_personal_information_hint'] = 'Delete all personal information fro
 $lang['delete_personal_information'] = 'Delete Personal Information';
 $lang['delete_personal_information_prompt'] = 'Are you sure that you want to delete your personal information? This action cannot be undone.';
 $lang['location'] = 'Location';
+$lang['extra_period'] = '';
+$lang['extra_periods'] = '';
+$lang['extra_periods_hint'] = '';
+$lang['new_extra_period_title'] = '';
+$lang['extra_period_saved'] = '';
+$lang['add_extra_periods_during_each_day'] = '';
+$lang['add_extra_period'] = '';
diff --git a/src/application/language/english/translations_lang.php b/src/application/language/english/translations_lang.php
index 33dc74e3..c71b1933 100755
--- a/src/application/language/english/translations_lang.php
+++ b/src/application/language/english/translations_lang.php
@@ -298,3 +298,10 @@ $lang['delete_personal_information_hint'] = 'Delete all personal information fro
 $lang['delete_personal_information'] = 'Delete Personal Information';
 $lang['delete_personal_information_prompt'] = 'Are you sure that you want to delete your personal information? This action cannot be undone.';
 $lang['location'] = 'Location';
+$lang['extra_period'] = 'Extra working day';
+$lang['extra_periods'] = 'Extra working days';
+$lang['extra_periods_hint'] = 'Add a working day outside the working plan.';
+$lang['new_extra_period_title'] = 'New working day';
+$lang['extra_period_saved'] = 'New working day saved successfully!';
+$lang['add_extra_periods_during_each_day'] = 'Add working days outside the working plan.';
+$lang['add_extra_period'] = 'Add a working day';
diff --git a/src/application/language/finnish/translations_lang.php b/src/application/language/finnish/translations_lang.php
index 8ec16de6..61d891eb 100755
--- a/src/application/language/finnish/translations_lang.php
+++ b/src/application/language/finnish/translations_lang.php
@@ -298,3 +298,10 @@ $lang['delete_personal_information_hint'] = 'Delete all personal information fro
 $lang['delete_personal_information'] = 'Delete Personal Information';
 $lang['delete_personal_information_prompt'] = 'Are you sure that you want to delete your personal information? This action cannot be undone.';
 $lang['location'] = 'Location';
+$lang['extra_period'] = '';
+$lang['extra_periods'] = '';
+$lang['extra_periods_hint'] = '';
+$lang['new_extra_period_title'] = '';
+$lang['extra_period_saved'] = '';
+$lang['add_extra_periods_during_each_day'] = '';
+$lang['add_extra_period'] = '';
diff --git a/src/application/language/french/translations_lang.php b/src/application/language/french/translations_lang.php
index 36f5f59c..ca61da96 100755
--- a/src/application/language/french/translations_lang.php
+++ b/src/application/language/french/translations_lang.php
@@ -298,3 +298,13 @@ $lang['delete_personal_information_hint'] = 'Effacer toutes vos données personn
 $lang['delete_personal_information'] = 'Effacer toutes mes données personnelles';
 $lang['delete_personal_information_prompt'] = 'Etes-vous sûr(e) de vouloir effacer toutes vos données personnelles ? Cette action est irréversible.';
 $lang['location'] = 'Location';
+$lang['fixed'] = 'Fixed';
+$lang['attendants_number'] = 'Attendants Number';
+$lang['reset_working_plan'] = 'Reset the working plan back to the default values.';
+$lang['extra_period'] = '';
+$lang['extra_periods'] = '';
+$lang['extra_periods_hint'] = '';
+$lang['new_extra_period_title'] = '';
+$lang['extra_period_saved'] = '';
+$lang['add_extra_periods_during_each_day'] = '';
+$lang['add_extra_period'] = '';
diff --git a/src/application/language/german/translations_lang.php b/src/application/language/german/translations_lang.php
index f252cd01..c4e3b38a 100755
--- a/src/application/language/german/translations_lang.php
+++ b/src/application/language/german/translations_lang.php
@@ -298,3 +298,10 @@ $lang['delete_personal_information_hint'] = 'Alle persönlichen Informationen au
 $lang['delete_personal_information'] = 'Persönlichen Informationen löschen';
 $lang['delete_personal_information_prompt'] = 'Sind Sie sicher, dass Sie Ihre persönlichen Daten löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden.';
 $lang['location'] = 'Ort';
+$lang['extra_period'] = '';
+$lang['extra_periods'] = '';
+$lang['extra_periods_hint'] = '';
+$lang['new_extra_period_title'] = '';
+$lang['extra_period_saved'] = '';
+$lang['add_extra_periods_during_each_day'] = '';
+$lang['add_extra_period'] = '';
diff --git a/src/application/language/greek/translations_lang.php b/src/application/language/greek/translations_lang.php
index b2e234a7..5f98cfcd 100755
--- a/src/application/language/greek/translations_lang.php
+++ b/src/application/language/greek/translations_lang.php
@@ -298,3 +298,10 @@ $lang['delete_personal_information_hint'] = 'Διαγραφή όλων των π
 $lang['delete_personal_information'] = 'Διαγραφή Προσωπικών Πληροφοριών';
 $lang['delete_personal_information_prompt'] = 'Είστε σίγουρος ότι θέλετε να διαγράψετε τις προσωπικές σας πληροφορίες; Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.';
 $lang['location'] = 'Τοποθεσία';
+$lang['extra_period'] = '';
+$lang['extra_periods'] = '';
+$lang['extra_periods_hint'] = '';
+$lang['new_extra_period_title'] = '';
+$lang['extra_period_saved'] = '';
+$lang['add_extra_periods_during_each_day'] = '';
+$lang['add_extra_period'] = '';
diff --git a/src/application/language/hindi/translations_lang.php b/src/application/language/hindi/translations_lang.php
index abea1d55..5471bf2b 100755
--- a/src/application/language/hindi/translations_lang.php
+++ b/src/application/language/hindi/translations_lang.php
@@ -298,3 +298,10 @@ $lang['delete_personal_information_hint'] = 'Delete all personal information fro
 $lang['delete_personal_information'] = 'Delete Personal Information';
 $lang['delete_personal_information_prompt'] = 'Are you sure that you want to delete your personal information? This action cannot be undone.';
 $lang['location'] = 'Location';
+$lang['extra_period'] = '';
+$lang['extra_periods'] = '';
+$lang['extra_periods_hint'] = '';
+$lang['new_extra_period_title'] = '';
+$lang['extra_period_saved'] = '';
+$lang['add_extra_periods_during_each_day'] = '';
+$lang['add_extra_period'] = '';
diff --git a/src/application/language/hungarian/translations_lang.php b/src/application/language/hungarian/translations_lang.php
index 4e074324..177cf794 100755
--- a/src/application/language/hungarian/translations_lang.php
+++ b/src/application/language/hungarian/translations_lang.php
@@ -298,3 +298,10 @@ $lang['delete_personal_information_hint'] = 'Delete all personal information fro
 $lang['delete_personal_information'] = 'Delete Personal Information';
 $lang['delete_personal_information_prompt'] = 'Are you sure that you want to delete your personal information? This action cannot be undone.';
 $lang['location'] = 'Location';
+$lang['extra_period'] = '';
+$lang['extra_periods'] = '';
+$lang['extra_periods_hint'] = '';
+$lang['new_extra_period_title'] = '';
+$lang['extra_period_saved'] = '';
+$lang['add_extra_periods_during_each_day'] = '';
+$lang['add_extra_period'] = '';
diff --git a/src/application/language/italian/translations_lang.php b/src/application/language/italian/translations_lang.php
index b4625602..a3e6cd21 100755
--- a/src/application/language/italian/translations_lang.php
+++ b/src/application/language/italian/translations_lang.php
@@ -298,3 +298,10 @@ $lang['delete_personal_information_hint'] = 'Delete all personal information fro
 $lang['delete_personal_information'] = 'Delete Personal Information';
 $lang['delete_personal_information_prompt'] = 'Are you sure that you want to delete your personal information? This action cannot be undone.';
 $lang['location'] = 'Location';
+$lang['extra_period'] = 'Giorno extra';
+$lang['extra_periods'] = 'Giorni Extra';
+$lang['extra_periods_hint'] = 'Aggiungi una giornata lavorativa al di fuori del piano di lavoro.';
+$lang['new_extra_period_title'] = 'Nuova giornata lavorativa';
+$lang['extra_period_saved'] = 'Giornata lavorativa salvata con successo!';
+$lang['add_extra_periods_during_each_day'] = 'Aggiungi giornate lavorative al di fuori del piano di lavoro.';
+$lang['add_extra_period'] = 'Aggiungi giornata lavorativa';
diff --git a/src/application/language/japanese/translations_lang.php b/src/application/language/japanese/translations_lang.php
index 9087afe6..d3cfae0a 100755
--- a/src/application/language/japanese/translations_lang.php
+++ b/src/application/language/japanese/translations_lang.php
@@ -298,3 +298,10 @@ $lang['delete_personal_information_hint'] = 'Delete all personal information fro
 $lang['delete_personal_information'] = 'Delete Personal Information';
 $lang['delete_personal_information_prompt'] = 'Are you sure that you want to delete your personal information? This action cannot be undone.';
 $lang['location'] = 'Location';
+$lang['extra_period'] = '';
+$lang['extra_periods'] = '';
+$lang['extra_periods_hint'] = '';
+$lang['new_extra_period_title'] = '';
+$lang['extra_period_saved'] = '';
+$lang['add_extra_periods_during_each_day'] = '';
+$lang['add_extra_period'] = '';
diff --git a/src/application/language/luxembourgish/translations_lang.php b/src/application/language/luxembourgish/translations_lang.php
index 91dd0e14..ae781c5f 100755
--- a/src/application/language/luxembourgish/translations_lang.php
+++ b/src/application/language/luxembourgish/translations_lang.php
@@ -298,3 +298,10 @@ $lang['delete_personal_information_hint'] = 'Delete all personal information fro
 $lang['delete_personal_information'] = 'Delete Personal Information';
 $lang['delete_personal_information_prompt'] = 'Are you sure that you want to delete your personal information? This action cannot be undone.';
 $lang['location'] = 'Location';
+$lang['extra_period'] = '';
+$lang['extra_periods'] = '';
+$lang['extra_periods_hint'] = '';
+$lang['new_extra_period_title'] = '';
+$lang['extra_period_saved'] = '';
+$lang['add_extra_periods_during_each_day'] = '';
+$lang['add_extra_period'] = '';
diff --git a/src/application/language/polish/translations_lang.php b/src/application/language/polish/translations_lang.php
index d04c6533..f346e25c 100755
--- a/src/application/language/polish/translations_lang.php
+++ b/src/application/language/polish/translations_lang.php
@@ -298,3 +298,10 @@ $lang['delete_personal_information_hint'] = 'Delete all personal information fro
 $lang['delete_personal_information'] = 'Delete Personal Information';
 $lang['delete_personal_information_prompt'] = 'Are you sure that you want to delete your personal information? This action cannot be undone.';
 $lang['location'] = 'Location';
+$lang['extra_period'] = '';
+$lang['extra_periods'] = '';
+$lang['extra_periods_hint'] = '';
+$lang['new_extra_period_title'] = '';
+$lang['extra_period_saved'] = '';
+$lang['add_extra_periods_during_each_day'] = '';
+$lang['add_extra_period'] = '';
diff --git a/src/application/language/portuguese-br/translations_lang.php b/src/application/language/portuguese-br/translations_lang.php
index 7d96954e..d1b7bca4 100755
--- a/src/application/language/portuguese-br/translations_lang.php
+++ b/src/application/language/portuguese-br/translations_lang.php
@@ -298,3 +298,15 @@ $lang['delete_personal_information_hint'] = 'Remover toda a informação pessoal
 $lang['delete_personal_information'] = 'Remover informação pessoal';
 $lang['delete_personal_information_prompt'] = 'Tem certeza que você quer remover usa informação pessoal? Essa ação não pode ser desfeita.';
 $lang['location'] = 'Location';
+$lang['availabilities_type'] = 'Availabilities Type';
+$lang['flexible'] = 'Flexible';
+$lang['fixed'] = 'Fixed';
+$lang['attendants_number'] = 'Attendants Number';
+$lang['reset_working_plan'] = 'Reset the working plan back to the default values.';
+$lang['extra_period'] = '';
+$lang['extra_periods'] = '';
+$lang['extra_periods_hint'] = '';
+$lang['new_extra_period_title'] = '';
+$lang['extra_period_saved'] = '';
+$lang['add_extra_periods_during_each_day'] = '';
+$lang['add_extra_period'] = '';
diff --git a/src/application/language/portuguese/translations_lang.php b/src/application/language/portuguese/translations_lang.php
index 6a5ee8e4..32cdf6ee 100755
--- a/src/application/language/portuguese/translations_lang.php
+++ b/src/application/language/portuguese/translations_lang.php
@@ -298,3 +298,10 @@ $lang['delete_personal_information_hint'] = 'Delete all personal information fro
 $lang['delete_personal_information'] = 'Delete Personal Information';
 $lang['delete_personal_information_prompt'] = 'Are you sure that you want to delete your personal information? This action cannot be undone.';
 $lang['location'] = 'Location';
+$lang['extra_period'] = '';
+$lang['extra_periods'] = '';
+$lang['extra_periods_hint'] = '';
+$lang['new_extra_period_title'] = '';
+$lang['extra_period_saved'] = '';
+$lang['add_extra_periods_during_each_day'] = '';
+$lang['add_extra_period'] = '';
diff --git a/src/application/language/romanian/translations_lang.php b/src/application/language/romanian/translations_lang.php
index cb06b90c..37fdaebd 100755
--- a/src/application/language/romanian/translations_lang.php
+++ b/src/application/language/romanian/translations_lang.php
@@ -298,3 +298,10 @@ $lang['delete_personal_information_hint'] = 'Delete all personal information fro
 $lang['delete_personal_information'] = 'Delete Personal Information';
 $lang['delete_personal_information_prompt'] = 'Are you sure that you want to delete your personal information? This action cannot be undone.';
 $lang['location'] = 'Location';
+$lang['extra_period'] = '';
+$lang['extra_periods'] = '';
+$lang['extra_periods_hint'] = '';
+$lang['new_extra_period_title'] = '';
+$lang['extra_period_saved'] = '';
+$lang['add_extra_periods_during_each_day'] = '';
+$lang['add_extra_period'] = '';
diff --git a/src/application/language/russian/translations_lang.php b/src/application/language/russian/translations_lang.php
index a1f4817a..5f1d427b 100755
--- a/src/application/language/russian/translations_lang.php
+++ b/src/application/language/russian/translations_lang.php
@@ -298,3 +298,10 @@ $lang['delete_personal_information_hint'] = 'Delete all personal information fro
 $lang['delete_personal_information'] = 'Delete Personal Information';
 $lang['delete_personal_information_prompt'] = 'Are you sure that you want to delete your personal information? This action cannot be undone.';
 $lang['location'] = 'Location';
+$lang['extra_period'] = '';
+$lang['extra_periods'] = '';
+$lang['extra_periods_hint'] = '';
+$lang['new_extra_period_title'] = '';
+$lang['extra_period_saved'] = '';
+$lang['add_extra_periods_during_each_day'] = '';
+$lang['add_extra_period'] = '';
diff --git a/src/application/language/slovak/translations_lang.php b/src/application/language/slovak/translations_lang.php
index 2f3214ae..b7c0bd62 100755
--- a/src/application/language/slovak/translations_lang.php
+++ b/src/application/language/slovak/translations_lang.php
@@ -298,3 +298,10 @@ $lang['delete_personal_information_hint'] = 'Delete all personal information fro
 $lang['delete_personal_information'] = 'Delete Personal Information';
 $lang['delete_personal_information_prompt'] = 'Are you sure that you want to delete your personal information? This action cannot be undone.';
 $lang['location'] = 'Location';
+$lang['extra_period'] = '';
+$lang['extra_periods'] = '';
+$lang['extra_periods_hint'] = '';
+$lang['new_extra_period_title'] = '';
+$lang['extra_period_saved'] = '';
+$lang['add_extra_periods_during_each_day'] = '';
+$lang['add_extra_period'] = '';
diff --git a/src/application/language/spanish/translations_lang.php b/src/application/language/spanish/translations_lang.php
index cffc8b93..d34ac84e 100755
--- a/src/application/language/spanish/translations_lang.php
+++ b/src/application/language/spanish/translations_lang.php
@@ -298,3 +298,10 @@ $lang['delete_personal_information_hint'] = 'Delete all personal information fro
 $lang['delete_personal_information'] = 'Delete Personal Information';
 $lang['delete_personal_information_prompt'] = 'Are you sure that you want to delete your personal information? This action cannot be undone.';
 $lang['location'] = 'Location';
+$lang['extra_period'] = '';
+$lang['extra_periods'] = '';
+$lang['extra_periods_hint'] = '';
+$lang['new_extra_period_title'] = '';
+$lang['extra_period_saved'] = '';
+$lang['add_extra_periods_during_each_day'] = '';
+$lang['add_extra_period'] = '';
diff --git a/src/application/language/turkish/translations_lang.php b/src/application/language/turkish/translations_lang.php
index 1e77b547..59b7e1f5 100755
--- a/src/application/language/turkish/translations_lang.php
+++ b/src/application/language/turkish/translations_lang.php
@@ -298,3 +298,10 @@ $lang['delete_personal_information_hint'] = 'Delete all personal information fro
 $lang['delete_personal_information'] = 'Delete Personal Information';
 $lang['delete_personal_information_prompt'] = 'Are you sure that you want to delete your personal information? This action cannot be undone.';
 $lang['location'] = 'Location';
+$lang['extra_period'] = '';
+$lang['extra_periods'] = '';
+$lang['extra_periods_hint'] = '';
+$lang['new_extra_period_title'] = '';
+$lang['extra_period_saved'] = '';
+$lang['add_extra_periods_during_each_day'] = '';
+$lang['add_extra_period'] = '';
diff --git a/src/application/migrations/014_add_user_extra_working_plan.php b/src/application/migrations/014_add_user_extra_working_plan.php
new file mode 100644
index 00000000..e934484c
--- /dev/null
+++ b/src/application/migrations/014_add_user_extra_working_plan.php
@@ -0,0 +1,37 @@
+<?php defined('BASEPATH') OR exit('No direct script access allowed');
+
+/* ----------------------------------------------------------------------------
+ * Easy!Appointments - Open Source Web Scheduler
+ *
+ * @package     EasyAppointments
+ * @author      A.Tselegidis <alextselegidis@gmail.com>
+ * @copyright   Copyright (c) 2013 - 2018, Alex Tselegidis
+ * @license     http://opensource.org/licenses/GPL-3.0 - GPLv3
+ * @link        http://easyappointments.org
+ * @since       v1.2.0
+ * ---------------------------------------------------------------------------- */
+
+class Migration_Add_user_extra_working_plan extends CI_Migration {
+    public function up()
+    {
+        if (!$this->db->field_exists('extra_working_plan', 'ea_user_settings')) {
+            $fields = [
+                'extra_working_plan' => [
+                    'type' => 'TEXT',
+                    'null' => TRUE,
+                    'default' => '',
+                    'after' => 'working_plan'
+                ]
+            ];
+
+            $this->dbforge->add_column('ea_user_settings', $fields);
+        }
+    }
+
+    public function down()
+    {
+        if (!$this->db->field_exists('extra_working_plan', 'ea_user_settings')) {
+            $this->dbforge->drop_column('ea_user_settings', 'extra_working_plan');
+        }
+    }
+}
diff --git a/src/application/models/Providers_model.php b/src/application/models/Providers_model.php
old mode 100644
new mode 100755
index d5529829..c3c001cd
--- a/src/application/models/Providers_model.php
+++ b/src/application/models/Providers_model.php
@@ -600,6 +600,13 @@ class Providers_Model extends CI_Model {
 
         foreach ($settings as $name => $value)
         {
+            // Sort in descending order the extra working plan days
+            if ($name == 'extra_working_plan') {
+                $value = json_decode($value, true);
+                // Sort the array and put in reverse order
+                krsort($value);
+                $value = json_encode($value);
+            }
             $this->set_setting($name, $value, $provider_id);
         }
     }
@@ -638,6 +645,86 @@ class Providers_Model extends CI_Model {
         }
     }
 
+    /**
+     * Save the provider extra working plan days.
+     *
+     * @param array $extra_period Contains the date and the hours of the extra working plan day.
+     * @param int $provider_id The selected provider record id.
+     *
+     * @return bool Return if the new extra working plan is correctly saved to DB.
+     *
+     * @throws Exception If start time is after the end time.
+     * @throws Exception If $provider_id argument is invalid.
+     */
+    public function set_extra_working_day($extra_period, $provider_id)
+    {
+        // Validate period
+        $dateStart = date('Y-m-d', strtotime($extra_period['start_datetime']));
+        $start = date('H:i',strtotime($extra_period['start_datetime']));
+        $end = date('H:i',strtotime($extra_period['end_datetime']));
+        if ($start > $end)
+        {
+            throw new Exception('Unavailable period start must be prior to end.');
+        }
+
+        // Validate provider record
+        $where_clause = [
+            'id' => $provider_id,
+            'id_roles' => $this->db->get_where('ea_roles', ['slug' => DB_SLUG_PROVIDER])->row()->id
+        ];
+
+        if ($this->db->get_where('ea_users', $where_clause)->num_rows() == 0)
+        {
+            throw new Exception('Provider id was not found in database.');
+        }
+
+        // Add record to database.
+        $extra_working_plan = json_decode($this->get_setting('extra_working_plan', $provider_id), true);
+
+        $extra_working_plan[$dateStart] = [
+            'start' => $start,
+            'end' => $end,
+            'breaks' => []
+        ];
+
+        $success = $this->set_setting('extra_working_plan', json_encode($extra_working_plan), $provider_id);
+
+        return $success;
+    }
+
+    /**
+     * Delete a provider extra working plan day.
+     *
+     * @param string $extra_period Contains the date to be deleted from the extra working plan.
+     * @param int $provider_id The selected provider record id.
+     *
+     * @return bool Return if the new extra working plan is correctly deleted from DB.
+     *
+     * @throws Exception If $provider_id argument is invalid.
+     */
+    public function delete_extra_working_day($extra_period, $provider_id)
+    {
+        // Validate provider record
+        $where_clause = [
+            'id' => $provider_id,
+            'id_roles' => $this->db->get_where('ea_roles', ['slug' => DB_SLUG_PROVIDER])->row()->id
+        ];
+
+        if ($this->db->get_where('ea_users', $where_clause)->num_rows() == 0)
+        {
+            throw new Exception('Provider id was not found in database.');
+        }
+
+        // Add record to database.
+        $extra_working_plan = json_decode($this->get_setting('extra_working_plan', $provider_id), true);
+
+        unset($extra_working_plan[$extra_period]);
+
+        $success = $this->set_setting('extra_working_plan', json_encode($extra_working_plan), $provider_id);
+
+        return $success;
+    }
+
     /**
      * Validate Records Username
      *
diff --git a/src/application/views/backend/calendar.php b/src/application/views/backend/calendar.php
index c02b1086..09f7a9bf 100755
--- a/src/application/views/backend/calendar.php
+++ b/src/application/views/backend/calendar.php
@@ -10,6 +10,7 @@
 <script src="<?= asset_url('assets/js/backend_calendar_google_sync.js') ?>"></script>
 <script src="<?= asset_url('assets/js/backend_calendar_appointments_modal.js') ?>"></script>
 <script src="<?= asset_url('assets/js/backend_calendar_unavailabilities_modal.js') ?>"></script>
+<script src="<?= asset_url('assets/js/backend_calendar_extra_periods_modal.js') ?>"></script>
 <script src="<?= asset_url('assets/js/backend_calendar_api.js') ?>"></script>
 <script>
     var GlobalVariables = {
@@ -73,6 +74,11 @@
                     <span class="glyphicon glyphicon-plus"></span>
                     <?= lang('unavailable') ?>
                 </button>
+
+                <button id="insert-extra-period" class="btn btn-default" title="<?= lang('extra_periods_hint') ?>">
+                    <span class="glyphicon glyphicon-plus"></span>
+                    <?= lang('extra_period') ?>
+                </button>
             <?php endif ?>
 
             <button id="reload-appointments" class="btn btn-default" title="<?= lang('reload_appointments_hint') ?>">
@@ -322,6 +328,47 @@
     </div>
 </div>
 
+<!-- MANAGE EXTRA PERIOD MODAL -->
+
+<div id="manage-extra" class="modal fade">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h3 class="modal-title"><?= lang('new_extra_period_title') ?></h3>
+            </div>
+            <div class="modal-body">
+                <div class="modal-message alert hidden"></div>
+
+                <form>
+                    <fieldset>
+                        <input id="extra-id" type="hidden">
+
+                        <div class="form-group">
+                            <label for="extra-provider" class="control-label"><?= lang('provider') ?></label>
+                            <select id="extra-provider" class="form-control"></select>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="extra-start" class="control-label"><?= lang('start') ?></label>
+                            <input id="extra-start" class="form-control">
+                        </div>
+
+                        <div class="form-group">
+                            <label for="extra-end" class="control-label"><?= lang('end') ?></label>
+                            <input id="extra-end" class="form-control">
+                        </div>
+                    </fieldset>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button id="save-extra" class="btn btn-primary"><?= lang('save') ?></button>
+                <button id="cancel-extra" class="btn btn-default" data-dismiss="modal"><?= lang('cancel') ?></button>
+            </div>
+        </div>
+    </div>
+</div>
+
 <!-- SELECT GOOGLE CALENDAR MODAL -->
 
 <div id="select-google-calendar" class="modal fade">
diff --git a/src/application/views/backend/users.php b/src/application/views/backend/users.php
index 7e420ba1..af68c660 100755
--- a/src/application/views/backend/users.php
+++ b/src/application/views/backend/users.php
@@ -16,6 +16,7 @@
         secretaries    : <?= json_encode($secretaries) ?>,
         services       : <?= json_encode($services) ?>,
         workingPlan    : <?= json_encode(json_decode($working_plan)) ?>,
+        extraWorkingPlan    : <?= json_encode(json_decode($extra_working_plan)) ?>,
         user           : {
             id         : <?= $user_id ?>,
             email      : <?= json_encode($user_email) ?>,
@@ -332,6 +333,35 @@
                             </thead>
                             <tbody><!-- Dynamic Content --></tbody>
                         </table>
+
+                        <br>
+
+                        <h3><?= lang('extra_periods') ?></h3>
+
+                        <span class="help-block">
+                            <?= lang('add_extra_periods_during_each_day') ?>
+                        </span>
+
+                        <div>
+                            <button type="button" class="add-extra-periods btn btn-primary">
+                                <span class="glyphicon glyphicon-plus"></span>
+                                <?= lang('add_extra_period') ?>
+                            </button>
+                        </div>
+
+                        <br>
+
+                        <table class="extra-periods table table-striped">
+                            <thead>
+                            <tr>
+                                <th><?= lang('day') ?></th>
+                                <th><?= lang('start') ?></th>
+                                <th><?= lang('end') ?></th>
+                                <th><?= lang('actions') ?></th>
+                            </tr>
+                            </thead>
+                            <tbody><!-- Dynamic Content --></tbody>
+                        </table>
                     </div>
                 </div>
             </div>
diff --git a/src/assets/css/backend.css b/src/assets/css/backend.css
index bd8b5d8e..747abd4c 100644
--- a/src/assets/css/backend.css
+++ b/src/assets/css/backend.css
@@ -662,10 +662,19 @@ body .form-horizontal .controls {
     padding: 4px 7px;
 }
 
+#users-page #providers .extra-periods .btn {
+    margin-right: 5px;
+    padding: 4px 7px;
+}
+
 @-moz-document url-prefix() {
     .breaks .break-day select {
         height: 36px;
     }
+
+    .extra-periods .extra-day select {
+        height: 36px;
+    }
 }
 
 #users-page .working-plan .checkbox,
diff --git a/src/assets/js/backend_calendar.js b/src/assets/js/backend_calendar.js
old mode 100644
new mode 100755
index 867a019b..ef593d22
--- a/src/assets/js/backend_calendar.js
+++ b/src/assets/js/backend_calendar.js
@@ -87,6 +87,7 @@ window.BackendCalendar = window.BackendCalendar || {};
         BackendCalendarGoogleSync.initialize();
         BackendCalendarAppointmentsModal.initialize();
         BackendCalendarUnavailabilitiesModal.initialize();
+        BackendCalendarExtraPeriodsModal.initialize();
 
         _bindEventHandlers();
     };
diff --git a/src/assets/js/backend_calendar_api.js b/src/assets/js/backend_calendar_api.js
old mode 100644
new mode 100755
index 54be2b9b..617d8f46
--- a/src/assets/js/backend_calendar_api.js
+++ b/src/assets/js/backend_calendar_api.js
@@ -85,4 +85,26 @@ window.BackendCalendarApi = window.BackendCalendarApi || {};
         });
     };
 
-})(window.BackendCalendarApi); 
+    /**
+     * Save extra period of work to database.
+     * @param {Object} extra_periods Contains the extra period data.
+     * @param {Function} successCallback The ajax success callback function.
+     * @param {Function} errorCallback The ajax failure callback function.
+     */
+    exports.saveExtraPeriod = function (extra_periods, successCallback, errorCallback) {
+        var postUrl = GlobalVariables.baseUrl + '/index.php/backend_api/ajax_save_extra_period';
+        var postData = {
+            csrfToken: GlobalVariables.csrfToken,
+            extra_period: JSON.stringify(extra_periods)
+        };
+
+        $.ajax({
+            type: 'POST',
+            url: postUrl,
+            data: postData,
+            success: successCallback,
+            error: errorCallback
+        });
+    }
+
+})(window.BackendCalendarApi);
diff --git a/src/assets/js/backend_calendar_default_view.js b/src/assets/js/backend_calendar_default_view.js
index 1ad0a557..4a76f346 100755
--- a/src/assets/js/backend_calendar_default_view.js
+++ b/src/assets/js/backend_calendar_default_view.js
@@ -127,7 +127,41 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
         $calendarPage.on('click', '.delete-popover', function () {
             $(this).parents().eq(2).remove(); // Hide the popover.
 
-            if (lastFocusedEventData.data.is_unavailable == false) {
+            // If id_role parameter exists the popover is an extra working day.
+            if (lastFocusedEventData.data.hasOwnProperty('id_roles')) {
+                // Do not display confirmation prompt.
+                var url = GlobalVariables.baseUrl + '/index.php/backend_api/ajax_delete_extra_period';
+                var data = {
+                    csrfToken: GlobalVariables.csrfToken,
+                    extra_period: lastFocusedEventData.start.format('YYYY-MM-DD'),
+                    provider_id: lastFocusedEventData.data.id
+                };
+
+                $.post(url, data, function (response) {
+                    $('#message_box').dialog('close');
+
+                    if (response.exceptions) {
+                        response.exceptions = GeneralFunctions.parseExceptions(response.exceptions);
+                        GeneralFunctions.displayMessageBox(GeneralFunctions.EXCEPTIONS_TITLE, GeneralFunctions.EXCEPTIONS_MESSAGE);
+                        $('#message_box').append(GeneralFunctions.exceptionsToHtml(response.exceptions));
+                        return;
+                    }
+
+                    if (response.warnings) {
+                        response.warnings = GeneralFunctions.parseExceptions(response.warnings);
+                        GeneralFunctions.displayMessageBox(GeneralFunctions.WARNINGS_TITLE, GeneralFunctions.WARNINGS_MESSAGE);
+                        $('#message_box').append(GeneralFunctions.exceptionsToHtml(response.warnings));
+                    }
+
+                    var extraWorkingPlan = jQuery.parseJSON(lastFocusedEventData.data.settings.extra_working_plan);
+                    delete extraWorkingPlan[lastFocusedEventData.start.format('YYYY-MM-DD')];
+                    lastFocusedEventData.data.settings.extra_working_plan = JSON.stringify(extraWorkingPlan);
+
+                    // Refresh calendar event items.
+                    $('#select-filter-item').trigger('change');
+                }, 'json').fail(GeneralFunctions.ajaxFailureHandler);
+            }
+            else if (lastFocusedEventData.data.is_unavailable == false) {
                 var buttons = [
                     {
                         text: 'OK',
@@ -299,6 +333,36 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                 '<button class="delete-popover btn btn-danger ' + displayDelete + '">' + EALang.delete + '</button>' +
                 '<button class="close-popover btn btn-default" data-po=' + jsEvent.target + '>' + EALang.close + '</button>' +
                 '</center>';
+        } else if ($(this).hasClass('fc-extra') || $parent.hasClass('fc-extra') || $altParent.hasClass('fc-extra')) {
+            displayDelete = (($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom'))
+                && GlobalVariables.user.privileges.appointments.delete == true)
+                ? '' : 'hide'; // Same value at the time.
+
+            var provider = '';
+            if (event.data) { // Only custom unavailable periods have notes.
+                provider = '<strong>' + EALang.provider + '</strong> ' + event.data.first_name + ' ' + event.data.last_name;
+            }
+
+            var extra_period = jQuery.parseJSON(event.data.settings.extra_working_plan)[event.start.format()];
+
+            html =
+                '<style type="text/css">'
+                + '.popover-content strong {min-width: 80px; display:inline-block;}'
+                + '.popover-content button {margin-right: 10px;}'
+                + '</style>' +
+                '<strong>' + EALang.start + '</strong> '
+                + GeneralFunctions.formatDate(event.start.format() + ' ' + extra_period.start, GlobalVariables.dateFormat, true)
+                + '<br>' +
+                '<strong>' + EALang.end + '</strong> '
+                + GeneralFunctions.formatDate(event.start.format() + ' ' + extra_period.end, GlobalVariables.dateFormat, true)
+                + '<br>'
+                + provider
+                + '<hr>' +
+                '<center>' +
+                '<button class="delete-popover btn btn-danger ' + displayDelete + '">' + EALang.delete + '</button>' +
+                '<button class="close-popover btn btn-default" data-po=' + jsEvent.target + '>' + EALang.close + '</button>' +
+                '</center>';
+
         } else {
             displayEdit = (GlobalVariables.user.privileges.appointments.edit == true)
                 ? '' : 'hide';
@@ -807,6 +871,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                 $.each(GlobalVariables.availableProviders, function (index, provider) {
                     if (provider.id == recordId) {
                         var workingPlan = jQuery.parseJSON(provider.settings.working_plan);
+                        var extraWorkingPlan = jQuery.parseJSON(provider.settings.extra_working_plan);
                         var unavailablePeriod;
 
                         switch (calendarView) {
@@ -837,19 +902,42 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
 
                                 // Non-working day.
                                 if (workingPlan[selectedDayName] == null) {
-                                    unavailablePeriod = {
-                                        title: EALang.not_working,
-                                        start: $calendar.fullCalendar('getView').intervalStart.clone(),
-                                        end: $calendar.fullCalendar('getView').intervalEnd.clone(),
-                                        allDay: false,
-                                        color: '#BEBEBE',
-                                        editable: false,
-                                        className: 'fc-unavailable'
-                                    };
+                                    // Extra working plan day.
+                                    var selectedDay = $calendar.fullCalendar('getView').intervalStart.clone();
+                                    selectedDay.locale('en');
+                                    if (extraWorkingPlan != null && selectedDay.format() in extraWorkingPlan) {
+                                        workingPlan[selectedDay.format('dddd').toLowerCase()] = extraWorkingPlan[selectedDay.format('YYYY-MM-DD')];
 
-                                    $calendar.fullCalendar('renderEvent', unavailablePeriod, false);
+                                        var start_extra = selectedDay.format('YYYY-MM-DD') + ' ' + extraWorkingPlan[selectedDay.format('YYYY-MM-DD')].start;
+                                        var end_extra = selectedDay.format('YYYY-MM-DD') + ' ' + extraWorkingPlan[selectedDay.format('YYYY-MM-DD')].end;
 
-                                    return; // Go to next loop.
+                                        var extraPeriod = {
+                                            title: EALang.extra_period,
+                                            start: moment(start_extra, 'YYYY-MM-DD HH:mm', true),
+                                            end: moment(end_extra, 'YYYY-MM-DD HH:mm', true).add(1, 'day'),
+                                            allDay: true,
+                                            color: '#879DB4',
+                                            editable: false,
+                                            className: 'fc-extra fc-custom',
+                                            data: provider
+                                        };
+
+                                        $calendar.fullCalendar('renderEvent', extraPeriod, false);
+                                    } else {
+                                        unavailablePeriod = {
+                                            title: EALang.not_working,
+                                            start: $calendar.fullCalendar('getView').intervalStart.clone(),
+                                            end: $calendar.fullCalendar('getView').intervalEnd.clone(),
+                                            allDay: false,
+                                            color: '#BEBEBE',
+                                            editable: false,
+                                            className: 'fc-unavailable'
+                                        };
+
+                                        $calendar.fullCalendar('renderEvent', unavailablePeriod, false);
+
+                                        return; // Go to next loop.
+                                    }
                                 }
 
                                 // Add unavailable period before work starts.
@@ -953,22 +1041,43 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
 
                                 $.each(workingPlan, function (index, workingDay) {
                                     if (workingDay == null) {
-                                        // Add a full day unavailable event.
-                                        unavailablePeriod = {
-                                            title: EALang.not_working,
-                                            start: moment(currentDateStart.format('YYYY-MM-DD')),
-                                            end: moment(currentDateEnd.format('YYYY-MM-DD')),
-                                            allDay: false,
-                                            color: '#BEBEBE',
-                                            editable: false,
-                                            className: 'fc-unavailable'
-                                        };
+                                        // Check if the day is an extra working day added to the working plan
+                                        if (extraWorkingPlan != null && currentDateStart.format('YYYY-MM-DD') in extraWorkingPlan) {
+                                            workingDay = extraWorkingPlan[currentDateStart.format('YYYY-MM-DD')]
 
-                                        $calendar.fullCalendar('renderEvent', unavailablePeriod, true);
-                                        currentDateStart.add(1, 'days');
-                                        currentDateEnd.add(1, 'days');
+                                            var start_extra = currentDateStart.format('YYYY-MM-DD') + ' ' + extraWorkingPlan[currentDateStart.format('YYYY-MM-DD')].start;
+                                            var end_extra = currentDateStart.format('YYYY-MM-DD') + ' ' + extraWorkingPlan[currentDateStart.format('YYYY-MM-DD')].end;
 
-                                        return; // Go to the next loop.
+                                            var extraPeriod = {
+                                                title: EALang.extra_period,
+                                                start: moment(start_extra, 'YYYY-MM-DD HH:mm', true),
+                                                end: moment(end_extra, 'YYYY-MM-DD HH:mm', true).add(1, 'day'),
+                                                allDay: true,
+                                                color: '#879DB4',
+                                                editable: false,
+                                                className: 'fc-extra fc-custom',
+                                                data: provider
+                                            };
+
+                                            $calendar.fullCalendar('renderEvent', extraPeriod, false);
+                                        } else {
+                                            // Add a full day unavailable event.
+                                            unavailablePeriod = {
+                                                title: EALang.not_working,
+                                                start: moment(currentDateStart.format('YYYY-MM-DD')),
+                                                end: moment(currentDateEnd.format('YYYY-MM-DD')),
+                                                allDay: false,
+                                                color: '#BEBEBE',
+                                                editable: false,
+                                                className: 'fc-unavailable'
+                                            };
+
+                                            $calendar.fullCalendar('renderEvent', unavailablePeriod, true);
+                                            currentDateStart.add(1, 'days');
+                                            currentDateEnd.add(1, 'days');
+
+                                            return; // Go to the next loop.
+                                        }
                                     }
 
                                     var start;
diff --git a/src/assets/js/backend_calendar_extra_periods_modal.js b/src/assets/js/backend_calendar_extra_periods_modal.js
new file mode 100644
index 00000000..95329646
--- /dev/null
+++ b/src/assets/js/backend_calendar_extra_periods_modal.js
@@ -0,0 +1,253 @@
+/* ----------------------------------------------------------------------------
+ * Easy!Appointments - Open Source Web Scheduler
+ *
+ * @package     EasyAppointments
+ * @author      A.Tselegidis <alextselegidis@gmail.com>
+ * @copyright   Copyright (c) 2013 - 2017, Alex Tselegidis
+ * @license     http://opensource.org/licenses/GPL-3.0 - GPLv3
+ * @link        http://easyappointments.org
+ * @since       v1.2.0
+ * ---------------------------------------------------------------------------- */
+
+/**
+ * Backend Calendar Extra Periods Modal
+ *
+ * This module implements the extra periods modal functionality.
+ *
+ * @module BackendCalendarExtraPeriodsModal
+ */
+window.BackendCalendarExtraPeriodsModal = window.BackendCalendarExtraPeriodsModal || {};
+
+(function (exports) {
+
+    'use strict';
+
+    function _bindEventHandlers() {
+        /**
+         * Event: Manage extra Dialog Save Button "Click"
+         *
+         * Stores the extra period changes or inserts a new record.
+         */
+        $('#manage-extra #save-extra').click(function () {
+            var $dialog = $('#manage-extra');
+            $dialog.find('.has-error').removeClass('has-error');
+            var start = $dialog.find('#extra-start').datetimepicker('getDate');
+            var end = Date.parse($dialog.find('#extra-end').datetimepicker('getDate'));
+
+            if (start.toString('HH:mm') > end.toString('HH:mm')) {
+                // Start time is after end time - display message to user.
+                $dialog.find('.modal-message')
+                    .text(EALang.start_date_before_end_error)
+                    .addClass('alert-danger')
+                    .removeClass('hidden');
+
+                $dialog.find('#extra-start, #extra-end').closest('.form-group').addClass('has-error');
+                return;
+            }
+
+            // extra period records go to the appointments table.
+            var extra = {
+                start_datetime: start.toString('yyyy-MM-dd HH:mm'),
+                end_datetime: start.toString('yyyy-MM-dd') + ' ' + end.toString('HH:mm'),
+                id_users_provider: $('#extra-provider').val() // curr provider
+            };
+
+            //if ($dialog.find('#extra-id').val() !== '') {
+            //    // Set the id value, only if we are editing an appointment.
+            //    extra.id = $dialog.find('#extra-id').val();
+            //}
+
+            var successCallback = function (response) {
+                if (response.exceptions) {
+                    response.exceptions = GeneralFunctions.parseExceptions(response.exceptions);
+                    GeneralFunctions.displayMessageBox(GeneralFunctions.EXCEPTIONS_TITLE,
+                        GeneralFunctions.EXCEPTIONS_MESSAGE);
+                    $('#message_box').append(GeneralFunctions.exceptionsToHtml(response.exceptions));
+
+                    $dialog.find('.modal-message')
+                        .text(EALang.unexpected_issues_occurred)
+                        .addClass('alert-danger')
+                        .removeClass('hidden');
+
+                    return;
+                }
+
+                if (response.warnings) {
+                    response.warnings = GeneralFunctions.parseExceptions(response.warnings);
+                    GeneralFunctions.displayMessageBox(GeneralFunctions.WARNINGS_TITLE,
+                        GeneralFunctions.WARNINGS_MESSAGE);
+                    $('#message_box').append(GeneralFunctions.exceptionsToHtml(response.warnings));
+                }
+
+                // Display success message to the user.
+                $dialog.find('.modal-message')
+                    .text(EALang.extra_period_saved)
+                    .addClass('alert-success')
+                    .removeClass('alert-danger hidden');
+
+                // Close the modal dialog and refresh the calendar appointments after one second.
+                setTimeout(function () {
+                    $dialog.find('.alert').addClass('hidden');
+                    $dialog.modal('hide');
+
+                    var providerId = $('#extra-provider').val();
+                    var provider = GlobalVariables.availableProviders.filter(function (p) {
+                        return p.id === providerId;
+                    })[0];
+                    var providerIdx = GlobalVariables.availableProviders.indexOf(provider);
+
+                    var extraWorkingPlan = jQuery.parseJSON(provider.settings.extra_working_plan);
+                    extraWorkingPlan[start.toString('yyyy-MM-dd')] = {
+                        start: start.toString('HH:mm'),
+                        end: end.toString('HH:mm'),
+                        breaks: []
+                    };
+                    provider.settings.extra_working_plan = JSON.stringify(extraWorkingPlan);
+                    GlobalVariables.availableProviders[providerIdx] = provider;
+
+                    $('#select-filter-item').trigger('change');
+                }, 2000);
+            };
+
+            var errorCallback = function (jqXHR, textStatus, errorThrown) {
+                GeneralFunctions.displayMessageBox('Communication Error', 'Unfortunately ' +
+                    'the operation could not complete due to server communication errors.');
+
+                $dialog.find('.modal-message').txt(EALang.service_communication_error);
+                $dialog.find('.modal-message').addClass('alert-danger').removeClass('hidden');
+            };
+
+            BackendCalendarApi.saveExtraPeriod(extra, successCallback, errorCallback);
+        });
+
+        /**
+         * Event: Manage extra Dialog Cancel Button "Click"
+         *
+         * Closes the dialog without saveing any changes to the database.
+         */
+        $('#manage-extra #cancel-extra').click(function () {
+            $('#manage-extra').modal('hide');
+        });
+
+        /**
+         * Event : Insert extra Time Period Button "Click"
+         *
+         * When the user clicks this button a popup dialog appears and the use can set a time period where
+         * he cannot accept any appointments.
+         */
+        $('#insert-extra-period').click(function () {
+            BackendCalendarExtraPeriodsModal.resetExtraDialog();
+            var $dialog = $('#manage-extra');
+
+            // Set the default datetime values.
+            var start = new Date();
+            start.addDays(1);
+            start.set({'hour': 8});
+            start.set({'minute': 30});
+
+            if ($('.calendar-view').length === 0) {
+                $dialog.find('#extra-provider')
+                    .val($('#select-filter-item').val())
+                    .closest('.form-group')
+                    .hide();
+            }
+
+            $dialog.find('#extra-start').val(GeneralFunctions.formatDate(start, GlobalVariables.dateFormat, true));
+            $dialog.find('#extra-end').val(GlobalVariables.timeFormat === 'regular' ? '8:00 PM' : '19:00');
+            $dialog.find('.modal-header h3').text(EALang.new_extra_period_title);
+            $dialog.modal('show');
+        });
+    }
+
+    /**
+     * Reset extra dialog form.
+     *
+     * Reset the "#manage-extra" dialog. Use this method to bring the dialog to the initial state
+     * before it becomes visible to the user.
+     */
+    exports.resetExtraDialog = function () {
+        var $dialog = $('#manage-extra');
+
+        $dialog.find('#extra-id').val('');
+
+        // Set the default datetime values.
+        var start = new Date();
+        start.addDays(1);
+        start.set({'hour': 8});
+        start.set({'minute': 30});
+        var end = GlobalVariables.timeFormat === 'regular' ? '8:00 PM' : '19:00'
+
+        var dateFormat;
+
+        switch (GlobalVariables.dateFormat) {
+            case 'DMY':
+                dateFormat = 'dd/mm/yy';
+                break;
+            case 'MDY':
+                dateFormat = 'mm/dd/yy';
+                break;
+            case 'YMD':
+                dateFormat = 'yy/mm/dd';
+                break;
+        }
+
+
+        $dialog.find('#extra-start').datetimepicker({
+            dateFormat: dateFormat,
+            timeFormat: GlobalVariables.timeFormat === 'regular' ? 'h:mm tt' : GlobalVariables.timeFormat,
+
+            // Translation
+            dayNames: [EALang.sunday, EALang.monday, EALang.tuesday, EALang.wednesday,
+                EALang.thursday, EALang.friday, EALang.saturday],
+            dayNamesShort: [EALang.sunday.substr(0, 3), EALang.monday.substr(0, 3),
+                EALang.tuesday.substr(0, 3), EALang.wednesday.substr(0, 3),
+                EALang.thursday.substr(0, 3), EALang.friday.substr(0, 3),
+                EALang.saturday.substr(0, 3)],
+            dayNamesMin: [EALang.sunday.substr(0, 2), EALang.monday.substr(0, 2),
+                EALang.tuesday.substr(0, 2), EALang.wednesday.substr(0, 2),
+                EALang.thursday.substr(0, 2), EALang.friday.substr(0, 2),
+                EALang.saturday.substr(0, 2)],
+            monthNames: [EALang.january, EALang.february, EALang.march, EALang.april,
+                EALang.may, EALang.june, EALang.july, EALang.august, EALang.september,
+                EALang.october, EALang.november, EALang.december],
+            prevText: EALang.previous,
+            nextText: EALang.next,
+            currentText: EALang.now,
+            closeText: EALang.close,
+            timeOnlyTitle: EALang.select_time,
+            timeText: EALang.time,
+            hourText: EALang.hour,
+            minuteText: EALang.minutes,
+            firstDay: 0
+        });
+        $dialog.find('#extra-start').val(GeneralFunctions.formatDate(start, GlobalVariables.dateFormat, true));
+        $dialog.find('#extra-start').draggable();
+
+        $dialog.find('#extra-end').timepicker({
+            timeFormat: GlobalVariables.timeFormat === 'regular' ? 'h:mm tt' : GlobalVariables.timeFormat,
+            currentText: EALang.now,
+            closeText: EALang.close,
+            timeOnlyTitle: EALang.select_time,
+            timeText: EALang.time,
+            hourText: EALang.hour,
+            minuteText: EALang.minutes
+        });
+        $dialog.find('#extra-end').val(end);
+
+        // Clear the extra notes field.
+        $dialog.find('#extra-notes').val('');
+    };
+
+    exports.initialize = function () {
+        var extraProvider = $('#extra-provider');
+
+        for (var index in GlobalVariables.availableProviders) {
+            var provider = GlobalVariables.availableProviders[index];
+
+            extraProvider.append(new Option(provider.first_name + ' ' + provider.last_name, provider.id));
+        }
+
+        _bindEventHandlers();
+    };
+
+})(window.BackendCalendarExtraPeriodsModal);
diff --git a/src/assets/js/backend_users_providers.js b/src/assets/js/backend_users_providers.js
old mode 100644
new mode 100755
index f0a6785c..d5b910b9
--- a/src/assets/js/backend_users_providers.js
+++ b/src/assets/js/backend_users_providers.js
@@ -92,7 +92,7 @@
             $('#providers .record-details').find('select').prop('disabled', false);
             $('#provider-password, #provider-password-confirm').addClass('required');
             $('#provider-notifications').prop('disabled', false);
-            $('#providers').find('.add-break, .edit-break, .delete-break, #reset-working-plan').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);
             $('#providers input:checkbox').prop('disabled', false);
 
@@ -114,7 +114,7 @@
             $('#provider-password, #provider-password-confirm').removeClass('required');
             $('#provider-notifications').prop('disabled', false);
             $('#provider-services input:checkbox').prop('disabled', false);
-            $('#providers').find('.add-break, .edit-break, .delete-break, #reset-working-plan').prop('disabled', false);
+            $('#providers').find('.add-break, .edit-break, .delete-break, .add-extra-periods, .edit-extra, .delete-extra, #reset-working-plan').prop('disabled', false);
             $('#providers input:checkbox').prop('disabled', false);
             BackendUsers.wp.timepickers(false);
         });
@@ -163,6 +163,7 @@
                 settings: {
                     username: $('#provider-username').val(),
                     working_plan: JSON.stringify(BackendUsers.wp.get()),
+                    extra_working_plan: JSON.stringify(BackendUsers.wp.getExtraWP()),
                     notifications: $('#provider-notifications').hasClass('active'),
                     calendar_view: $('#provider-calendar-view').val()
                 }
@@ -233,6 +234,7 @@
          */
         $('#providers').on('click', '#reset-working-plan', function () {
             $('.breaks tbody').empty();
+            $('.extra-periods tbody').empty();
             $('.work-start, .work-end').val('');
             BackendUsers.wp.setup(GlobalVariables.workingPlan);
             BackendUsers.wp.timepickers(false);
@@ -357,11 +359,12 @@
         $('#provider-notifications').removeClass('active');
         $('#provider-notifications').prop('disabled', true);
         $('#provider-services input:checkbox').prop('disabled', true);
-        $('#providers .add-break, #reset-working-plan').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');
         $('#providers .working-plan input:checkbox').prop('disabled', true);
         $('.breaks').find('.edit-break, .delete-break').prop('disabled', true);
+        $('.extra-periods').find('.edit-extra, .delete-extra').prop('disabled', true);
 
         $('#edit-provider, #delete-provider').prop('disabled', true);
         $('#providers .record-details').find('input, textarea').val('');
@@ -369,6 +372,7 @@
         $('#provider-services input:checkbox').prop('checked', false);
         $('#provider-services a').remove();
         $('#providers .breaks tbody').empty();
+        $('#providers .extra-periods tbody').empty();
     };
 
     /**
@@ -426,6 +430,10 @@
         var workingPlan = $.parseJSON(provider.settings.working_plan);
         BackendUsers.wp.setup(workingPlan);
         $('.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);
     };
 
     /**
diff --git a/src/assets/js/general_functions.js b/src/assets/js/general_functions.js
index 70bf97dc..eb3f8a5c 100755
--- a/src/assets/js/general_functions.js
+++ b/src/assets/js/general_functions.js
@@ -524,4 +524,35 @@ window.GeneralFunctions = window.GeneralFunctions || {};
         })
             .html();
     };
+    /**
+     * Format a given date according to ISO 8601 date format string yyyy-mm-dd
+     * @param {String} date The date to be formatted.
+     * @param {String} dateFormatSetting The setting provided by PHP must be one of
+     * the "DMY", "MDY" or "YMD".
+     * @returns {String} Returns the formatted date string.
+     */
+    exports.ISO8601DateString = function (date, dateFormatSetting) {
+        var dayArray;
+
+        // It's necessary to manually parse the date because Date.parse() not support
+        // some formats tha instead are supported by Easy!Appointments
+        // The unsupported format is dd/MM/yyyy
+        switch (dateFormatSetting) {
+            case 'DMY':
+                dayArray = date.split('/');
+                date = dayArray[2] + '-' + dayArray[1] + '-' + dayArray[0];
+                break;
+            case 'MDY':
+                dayArray = date.split('/');
+                date = dayArray[2] + '-' + dayArray[0] + '-' + dayArray[1];
+                break;
+            case 'YMD':
+                date = date.replace('/','-');
+                break;
+            default:
+                throw new Error('Invalid date format setting provided!', dateFormatSetting);
+        }
+        return date;
+    }
+
 })(window.GeneralFunctions);
diff --git a/src/assets/js/working_plan.js b/src/assets/js/working_plan.js
index cc349dab..8982619d 100755
--- a/src/assets/js/working_plan.js
+++ b/src/assets/js/working_plan.js
@@ -89,6 +89,54 @@
         this.editableBreakTime($('.breaks').find('.break-start, .break-end'));
     };
 
+    /**
+     * Setup the dom elements of a given extra working plan day.
+     *
+     * @param {Object} extraWorkingPlan Contains the extra working day.
+     */
+    WorkingPlan.prototype.setupExtraPeriods = function (extraWorkingPlan) {
+        $.each(extraWorkingPlan, function (index, extraWorkingDay) {
+            if (extraWorkingDay != null) {
+
+                $('#' + index).prop('checked', true);
+                $('#' + index + '-start').val(Date.parse(extraWorkingDay.start).toString(GlobalVariables.timeFormat === 'regular' ? 'h:mm tt' : 'HH:mm').toUpperCase());
+                $('#' + index + '-end').val(Date.parse(extraWorkingDay.end).toString(GlobalVariables.timeFormat === 'regular' ? 'h:mm tt' : 'HH:mm').toUpperCase());
+
+                var day = GeneralFunctions.formatDate(Date.parse(index), GlobalVariables.dateFormat, false);
+
+                var tr =
+                    '<tr>' +
+                    '<td class="extra-day editable">' + day + '</td>' +
+                    '<td class="extra-start editable">' + Date.parse(extraWorkingDay.start).toString(GlobalVariables.timeFormat === 'regular' ? 'h:mm tt' : 'HH:mm').toUpperCase().toUpperCase() + '</td>' +
+                    '<td class="extra-end editable">' + Date.parse(extraWorkingDay.end).toString(GlobalVariables.timeFormat === 'regular' ? 'h:mm tt' : 'HH:mm').toUpperCase().toUpperCase() + '</td>' +
+                    '<td>' +
+                    '<button type="button" class="btn btn-default btn-sm edit-extra" title="' + EALang.edit + '">' +
+                    '<span class="glyphicon glyphicon-pencil"></span>' +
+                    '</button>' +
+                    '<button type="button" class="btn btn-default btn-sm delete-extra" title="' + EALang.delete + '">' +
+                    '<span class="glyphicon glyphicon-remove"></span>' +
+                    '</button>' +
+                    '<button type="button" class="btn btn-default btn-sm save-extra hidden" title="' + EALang.save + '">' +
+                    '<span class="glyphicon glyphicon-ok"></span>' +
+                    '</button>' +
+                    '<button type="button" class="btn btn-default btn-sm cancel-extra hidden" title="' + EALang.cancel + '">' +
+                    '<span class="glyphicon glyphicon-ban-circle"></span>' +
+                    '</button>' +
+                    '</td>' +
+                    '</tr>';
+                $('.extra-periods tbody').append(tr);
+            } else {
+                $('#' + index).prop('checked', false);
+                $('#' + index + '-start').prop('disabled', true);
+                $('#' + index + '-end').prop('disabled', true);
+            }
+        }.bind(this));
+
+        // Make break cells editable.
+        this.editableBreakTime($('.extra-periods .extra-day'));
+        this.editableBreakTime($('.extra-periods').find('.extra-start, .extra-end'));
+    };
+
     /**
      * Enable editable break day.
      *
@@ -172,8 +220,8 @@
             var id = $(this).attr('id');
 
             if ($(this).prop('checked') == true) {
-                $('#' + id + '-start').prop('disabled', false).val(GlobalVariables.timeFormat === 'regular' ? '9:00 AM' : '09:00');
-                $('#' + id + '-end').prop('disabled', false).val(GlobalVariables.timeFormat === 'regular' ? '6:00 PM' : '18:00');
+                $('#' + id + '-start').prop('disabled', false).val('9:00 AM');
+                $('#' + id + '-end').prop('disabled', false).val('6:00 PM');
             } else {
                 $('#' + id + '-start').prop('disabled', true).val('');
                 $('#' + id + '-end').prop('disabled', true).val('');
@@ -190,8 +238,8 @@
             var tr =
                 '<tr>' +
                 '<td class="break-day editable">' + EALang.sunday + '</td>' +
-                '<td class="break-start editable">' + (GlobalVariables.timeFormat === 'regular' ? '9:00 AM' : '09:00') + '</td>' +
-                '<td class="break-end editable">' + (GlobalVariables.timeFormat === 'regular' ? '10:00 AM' : '10:00') + '</td>' +
+                '<td class="break-start editable">9:00 AM</td>' +
+                '<td class="break-end editable">10:00 AM</td>' +
                 '<td>' +
                 '<button type="button" class="btn btn-default btn-sm edit-break" title="' + EALang.edit + '">' +
                 '<span class="glyphicon glyphicon-pencil"></span>' +
@@ -234,7 +282,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,
@@ -294,7 +342,7 @@
                 start = Date.parse($modifiedRow.find('.break-start input').val()),
                 end = Date.parse($modifiedRow.find('.break-end input').val());
 
-            if (start >= end) {
+            if (start > end) {
                 $modifiedRow.find('.break-end input').val(start.addHours(1).toString(GlobalVariables.timeFormat === 'regular' ? 'h:mm tt' : 'HH:mm'));
             }
 
@@ -306,6 +354,172 @@
             $(element).closest('table').find('.edit-break, .delete-break').removeClass('hidden');
             $('.add-break').prop('disabled', false);
         }.bind(this));
+
+        /**
+         * Event: Add Extra Period Button "Click"
+         *
+         * A new row is added on the table and the user can enter the new extra day
+         * data. After that he can either press the save or cancel button.
+         */
+        $('.add-extra-periods').click(function () {
+            var today = GeneralFunctions.formatDate(new Date(), GlobalVariables.dateFormat, false);
+            var tr =
+                '<tr>' +
+                '<td class="extra-day editable">' + today + '</td>' +
+                '<td class="extra-start editable">' + (GlobalVariables.timeFormat === 'regular' ? '9:00 AM' : '09:00').toUpperCase() + '</td>' +
+                '<td class="extra-end editable">' + (GlobalVariables.timeFormat === 'regular' ? '10:00 AM' : '10:00').toUpperCase() + '</td>' +
+                '<td>' +
+                '<button type="button" class="btn btn-default btn-sm edit-extra" title="' + EALang.edit + '">' +
+                '<span class="glyphicon glyphicon-pencil"></span>' +
+                '</button>' +
+                '<button type="button" class="btn btn-default btn-sm delete-extra" title="' + EALang.delete + '">' +
+                '<span class="glyphicon glyphicon-remove"></span>' +
+                '</button>' +
+                '<button type="button" class="btn btn-default btn-sm save-extra hidden" title="' + EALang.save + '">' +
+                '<span class="glyphicon glyphicon-ok"></span>' +
+                '</button>' +
+                '<button type="button" class="btn btn-default btn-sm cancel-extra hidden" title="' + EALang.cancel + '">' +
+                '<span class="glyphicon glyphicon-ban-circle"></span>' +
+                '</button>' +
+                '</td>' +
+                '</tr>';
+            $('.extra-periods').prepend(tr);
+
+            // Bind editable and event handlers.
+            tr = $('.extra-periods tr')[1];
+            this.editableBreakTime($(tr).find('.extra-day'));
+            this.editableBreakTime($(tr).find('.extra-start, .extra-end'));
+            $(tr).find('.edit-extra').trigger('click');
+            $('.add-extra-periods').prop('disabled', true);
+        }.bind(this));
+
+        /**
+         * Event: Edit Extra Period Button "Click"
+         *
+         * Enables the row editing for the "Extra Period" table rows.
+         */
+        $(document).on('click', '.edit-extra', function () {
+            // Reset previous editable tds
+            var $previousEdt = $(this).closest('table').find('.editable').get();
+            $.each($previousEdt, function (index, editable) {
+                if (editable.reset !== undefined) {
+                    editable.reset();
+                }
+            });
+
+            // 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',
+                currentText: EALang.now,
+                closeText: EALang.close,
+                timeOnlyTitle: EALang.select_time,
+                timeText: EALang.time,
+                hourText: EALang.hour,
+                minuteText: EALang.minutes
+            });
+
+            var dateFormat;
+
+            switch (GlobalVariables.dateFormat) {
+                case 'DMY':
+                    dateFormat = 'dd/mm/yy';
+                    break;
+                case 'MDY':
+                    dateFormat = 'mm/dd/yy';
+                    break;
+                case 'YMD':
+                    dateFormat = 'yy/mm/dd';
+                    break;
+            }
+
+            $(this).parent().parent().find('.extra-day input').datetimepicker({
+                dateFormat: dateFormat,
+
+                // Translation
+                dayNames: [EALang.sunday, EALang.monday, EALang.tuesday, EALang.wednesday,
+                    EALang.thursday, EALang.friday, EALang.saturday],
+                dayNamesShort: [EALang.sunday.substr(0, 3), EALang.monday.substr(0, 3),
+                    EALang.tuesday.substr(0, 3), EALang.wednesday.substr(0, 3),
+                    EALang.thursday.substr(0, 3), EALang.friday.substr(0, 3),
+                    EALang.saturday.substr(0, 3)],
+                dayNamesMin: [EALang.sunday.substr(0, 2), EALang.monday.substr(0, 2),
+                    EALang.tuesday.substr(0, 2), EALang.wednesday.substr(0, 2),
+                    EALang.thursday.substr(0, 2), EALang.friday.substr(0, 2),
+                    EALang.saturday.substr(0, 2)],
+                monthNames: [EALang.january, EALang.february, EALang.march, EALang.april,
+                    EALang.may, EALang.june, EALang.july, EALang.august, EALang.september,
+                    EALang.october, EALang.november, EALang.december],
+                prevText: EALang.previous,
+                nextText: EALang.next,
+                currentText: EALang.now,
+                closeText: EALang.close,
+                firstDay: 1,
+                showTimepicker: false
+            });
+
+            // Show save - cancel buttons.
+            $(this).closest('table').find('.edit-extra, .delete-extra').addClass('hidden');
+            $(this).parent().find('.save-extra, .cancel-extra').removeClass('hidden');
+            $(this).closest('tr').find('select,input:text').addClass('form-control input-sm')
+
+            $('.add-extra-periods').prop('disabled', true);
+        });
+
+        /**
+         * Event: Delete Extra Period Button "Click"
+         *
+         * Removes the current line from the "Extra Periods" table.
+         */
+        $(document).on('click', '.delete-extra', function () {
+            $(this).parent().parent().remove();
+        });
+
+        /**
+         * Event: Cancel Extra Period Button "Click"
+         *
+         * Bring the ".extra-period" table back to its initial state.
+         *
+         * @param {jQuery.Event} e
+         */
+        $(document).on('click', '.cancel-extra', function (e) {
+            var element = e.target;
+            var $modifiedRow = $(element).closest('tr');
+            this.enableCancel = true;
+            $modifiedRow.find('.cancel-editable').trigger('click');
+            this.enableCancel = false;
+
+            $(element).closest('table').find('.edit-extra, .delete-extra').removeClass('hidden');
+            $modifiedRow.find('.save-extra, .cancel-extra').addClass('hidden');
+            $('.add-extra-periods').prop('disabled', false);
+        }.bind(this));
+
+        /**
+         * Event: Save Extra Period Button "Click"
+         *
+         * Save the editable values and restore the table to its initial state.
+         *
+         * @param {jQuery.Event} e
+         */
+        $(document).on('click', '.save-extra', function (e) {
+            // Break's start time must always be prior to break's end.
+            var element = e.target,
+                $modifiedRow = $(element).closest('tr'),
+                start = Date.parse($modifiedRow.find('.extra-start input').val()),
+                end = Date.parse($modifiedRow.find('.extra-end input').val());
+
+            if (start > end) {
+                $modifiedRow.find('.extra-end input').val(start.addHours(1).toString(GlobalVariables.timeFormat === 'regular' ? 'h:mm tt' : 'HH:mm').toUpperCase());
+            }
+
+            this.enableSubmit = true;
+            $modifiedRow.find('.editable .submit-editable').trigger('click');
+            this.enableSubmit = false;
+
+            $modifiedRow.find('.save-extra, .cancel-extra').addClass('hidden');
+            $(element).closest('table').find('.edit-extra, .delete-extra').removeClass('hidden');
+            $('.add-extra-periods').prop('disabled', false);
+        }.bind(this));
     };
 
     /**
@@ -351,6 +565,30 @@
         return workingPlan;
     };
 
+    /**
+     * Get the extra working plan settings.
+     *
+     * @return {Object} Returns the extra working plan settings object.
+     */
+    WorkingPlan.prototype.getExtraWP = function () {
+        var extraWorkingPlan = {};
+        $('.extra-periods tbody tr').each(function (index, tr) {
+
+            var day = GeneralFunctions.ISO8601DateString($(tr).find('.extra-day').text(), GlobalVariables.dateFormat);
+
+            var start = $(tr).find('.extra-start').text();
+            var end = $(tr).find('.extra-end').text();
+
+            extraWorkingPlan[day] = {
+                start: Date.parse(start).toString('HH:mm'),
+                end: Date.parse(end).toString('HH:mm'),
+                breaks: []
+            };
+        }.bind(this));
+
+        return extraWorkingPlan;
+    };
+
     /**
      * Enables or disables the timepicker functionality from the working plan input text fields.
      *
@@ -362,7 +600,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,
@@ -375,7 +613,7 @@
                     var start = Date.parse($(this).parent().parent().find('.work-start').val()),
                         end = Date.parse($(this).parent().parent().find('.work-end').val());
 
-                    if (start >= end) {
+                    if (start > end) {
                         $(this).parent().parent().find('.work-end').val(start.addHours(1).toString(GlobalVariables.timeFormat === 'regular' ? 'h:mm tt' : 'HH:mm'));
                     }
                 }
diff --git a/src/assets/sql/structure.sql b/src/assets/sql/structure.sql
old mode 100644
new mode 100755
index 8c77109c..567f4a1f
--- a/src/assets/sql/structure.sql
+++ b/src/assets/sql/structure.sql
@@ -145,6 +145,7 @@ CREATE TABLE IF NOT EXISTS `ea_user_settings` (
     `password` VARCHAR(512),
     `salt` VARCHAR(512),
     `working_plan` TEXT,
+    `extra_working_plan` TEXT,
     `notifications` TINYINT(4) DEFAULT '0',
     `google_sync` TINYINT(4) DEFAULT '0',
     `google_token` TEXT,