diff --git a/application/views/appointments/book_success.php b/application/views/appointments/book_success.php
index ae655193..875d2eb1 100755
--- a/application/views/appointments/book_success.php
+++ b/application/views/appointments/book_success.php
@@ -73,6 +73,8 @@
 <script src="<?= base_url('assets/ext/jquery/jquery.min.js') ?>"></script>
 <script src="<?= base_url('assets/ext/bootstrap/js/bootstrap.bundle.min.js') ?>"></script>
 <script src="<?= base_url('assets/ext/datejs/date.min.js') ?>"></script>
+<script src="<?= asset_url('assets/ext/moment/moment.min.js') ?>"></script>
+<script src="<?= asset_url('assets/ext/moment/moment-timezone-with-data.min.js') ?>"></script>
 <script src="https://apis.google.com/js/client.js"></script>
 
 <script>
@@ -80,6 +82,7 @@
         csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
         appointmentData: <?= json_encode($appointment_data) ?>,
         providerData: <?= json_encode($provider_data) ?>,
+        customerData: <?= json_encode($customer_data) ?>,
         serviceData: <?= json_encode($service_data) ?>,
         companyName: <?= json_encode($company_name) ?>,
         googleApiKey: <?= json_encode(config('google_api_key')) ?>,
diff --git a/assets/js/frontend_book_success.js b/assets/js/frontend_book_success.js
index a15dd878..22282ec2 100644
--- a/assets/js/frontend_book_success.js
+++ b/assets/js/frontend_book_success.js
@@ -40,27 +40,21 @@ $(document).ready(function () {
                 throw new Error('Could not authorize user.');
             }
 
-            // The user has granted access, add the appointment to his calendar.
-            // Before making the event.insert request the the event resource data
-            // must be prepared.
-            var appointmentData = GlobalVariables.appointmentData;
+            // The user has granted access, add the appointment to his calendar. Before making the event.insert request
+            // the the event resource data must be prepared.
+            var providerData = GlobalVariables.providerData;
 
-            appointmentData.start_datetime = GeneralFunctions.ISODateString(
-                Date.parseExact(appointmentData.start_datetime,
-                    'yyyy-MM-dd HH:mm:ss'));
-            appointmentData.end_datetime = GeneralFunctions.ISODateString(
-                Date.parseExact(appointmentData.end_datetime,
-                    'yyyy-MM-dd HH:mm:ss'));
+            var appointmentData = GlobalVariables.appointmentData;
 
             // Create a valid Google Calendar API resource for the new event.
             var resource = {
                 summary: GlobalVariables.serviceData.name,
                 location: GlobalVariables.companyName,
                 start: {
-                    dateTime: appointmentData.start_datetime
+                    dateTime: moment.tz(appointmentData.start_datetime, providerData.timezone).format()
                 },
                 end: {
-                    dateTime: appointmentData.end_datetime
+                    dateTime: moment.tz(appointmentData.end_datetime, providerData.timezone).format()
                 },
                 attendees: [
                     {