diff --git a/application/views/appointments/book_success.php b/application/views/appointments/book_success.php
index 021edc81..7ed78141 100755
--- a/application/views/appointments/book_success.php
+++ b/application/views/appointments/book_success.php
@@ -68,14 +68,14 @@
 
     <script>
         var GlobalVariables = {
-            'csrfToken'         : <?= json_encode($this->security->get_csrf_hash()) ?>,
-            'appointmentData'   : <?= json_encode($appointment_data) ?>,
-            'providerData'      : <?= json_encode($provider_data) ?>,
-            'serviceData'       : <?= json_encode($service_data) ?>,
-            'companyName'       : <?= json_encode($company_name) ?>,
-            'googleApiKey'      : <?= json_encode(config('google_api_key')) ?>,
-            'googleClientId'    : <?= json_encode(config('google_client_id')) ?>,
-            'googleApiScope'    : 'https://www.googleapis.com/auth/calendar'
+            csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
+            appointmentData: <?= json_encode($appointment_data) ?>,
+            providerData: <?= json_encode($provider_data) ?>,
+            serviceData: <?= json_encode($service_data) ?>,
+            companyName: <?= json_encode($company_name) ?>,
+            googleApiKey: <?= json_encode(config('google_api_key')) ?>,
+            googleClientId: <?= json_encode(config('google_client_id')) ?>,
+            googleApiScope: 'https://www.googleapis.com/auth/calendar'
         };
 
         var EALang = <?= json_encode($this->lang->language) ?>;
diff --git a/application/views/backend/calendar.php b/application/views/backend/calendar.php
index 0242a736..8eb7b93b 100755
--- a/application/views/backend/calendar.php
+++ b/application/views/backend/calendar.php
@@ -13,25 +13,25 @@
 <script src="<?= asset_url('assets/js/backend_calendar_api.js') ?>"></script>
 <script>
     var GlobalVariables = {
-        'csrfToken': <?= json_encode($this->security->get_csrf_hash()) ?>,
-        'availableProviders': <?= json_encode($available_providers) ?>,
-        'availableServices': <?= json_encode($available_services) ?>,
-        'baseUrl': <?= json_encode($base_url) ?>,
-        'bookAdvanceTimeout': <?= $book_advance_timeout ?>,
-        'dateFormat': <?= json_encode($date_format) ?>,
-        'timeFormat': <?= json_encode($time_format) ?>,
-        'firstWeekday': <?= json_encode($first_weekday) ?>,
-        'editAppointment': <?= json_encode($edit_appointment) ?>,
-        'customers': <?= json_encode($customers) ?>,
-        'secretaryProviders': <?= json_encode($secretary_providers) ?>,
-        'calendarView': <?= json_encode($calendar_view) ?>,
-        'timezones': <?= json_encode($timezones) ?>,
-        'user': {
-            'id': <?= $user_id ?>,
-            'email': <?= json_encode($user_email) ?>,
-            'timezone': <?= json_encode($timezone) ?>,
-            'role_slug': <?= json_encode($role_slug) ?>,
-            'privileges': <?= json_encode($privileges) ?>,
+        csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
+        availableProviders: <?= json_encode($available_providers) ?>,
+        availableServices: <?= json_encode($available_services) ?>,
+        baseUrl: <?= json_encode($base_url) ?>,
+        bookAdvanceTimeout: <?= $book_advance_timeout ?>,
+        dateFormat: <?= json_encode($date_format) ?>,
+        timeFormat: <?= json_encode($time_format) ?>,
+        firstWeekday: <?= json_encode($first_weekday) ?>,
+        editAppointment: <?= json_encode($edit_appointment) ?>,
+        customers: <?= json_encode($customers) ?>,
+        secretaryProviders: <?= json_encode($secretary_providers) ?>,
+        calendarView: <?= json_encode($calendar_view) ?>,
+        timezones: <?= json_encode($timezones) ?>,
+        user: {
+            id: <?= $user_id ?>,
+            email: <?= json_encode($user_email) ?>,
+            timezone: <?= json_encode($timezone) ?>,
+            role_slug: <?= json_encode($role_slug) ?>,
+            privileges: <?= json_encode($privileges) ?>,
         }
     };
 
diff --git a/application/views/backend/customers.php b/application/views/backend/customers.php
index e59d246c..2ceaada4 100755
--- a/application/views/backend/customers.php
+++ b/application/views/backend/customers.php
@@ -3,21 +3,21 @@
 <script src="<?= asset_url('assets/js/backend_customers.js') ?>"></script>
 <script>
     var GlobalVariables = {
-        csrfToken          : <?= json_encode($this->security->get_csrf_hash()) ?>,
-        availableProviders : <?= json_encode($available_providers) ?>,
-        availableServices  : <?= json_encode($available_services) ?>,
-        secretaryProviders : <?= json_encode($secretary_providers) ?>,
-        dateFormat         : <?= json_encode($date_format) ?>,
-        timeFormat         : <?= json_encode($time_format) ?>,
-        baseUrl            : <?= json_encode($base_url) ?>,
-        customers          : <?= json_encode($customers) ?>,
-        timezones          : <?= json_encode($timezones) ?>,
-        user               : {
-            id         : <?= $user_id ?>,
-            email      : <?= json_encode($user_email) ?>,
-            timezone   : <?= json_encode($timezone) ?>,
-            role_slug  : <?= json_encode($role_slug) ?>,
-            privileges : <?= json_encode($privileges) ?>
+        csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
+        availableProviders: <?= json_encode($available_providers) ?>,
+        availableServices: <?= json_encode($available_services) ?>,
+        secretaryProviders: <?= json_encode($secretary_providers) ?>,
+        dateFormat: <?= json_encode($date_format) ?>,
+        timeFormat: <?= json_encode($time_format) ?>,
+        baseUrl: <?= json_encode($base_url) ?>,
+        customers: <?= json_encode($customers) ?>,
+        timezones: <?= json_encode($timezones) ?>,
+        user : {
+            id: <?= $user_id ?>,
+            email: <?= json_encode($user_email) ?>,
+            timezone: <?= json_encode($timezone) ?>,
+            role_slug: <?= json_encode($role_slug) ?>,
+            privileges: <?= json_encode($privileges) ?>
         }
     };
 
diff --git a/application/views/backend/services.php b/application/views/backend/services.php
index f027dce9..8add9d5b 100755
--- a/application/views/backend/services.php
+++ b/application/views/backend/services.php
@@ -3,18 +3,18 @@
 <script src="<?= asset_url('assets/js/backend_services.js') ?>"></script>
 <script>
     var GlobalVariables = {
-        csrfToken     : <?= json_encode($this->security->get_csrf_hash()) ?>,
-        baseUrl       : <?= json_encode($base_url) ?>,
-        dateFormat    : <?= json_encode($date_format) ?>,
-        timeFormat    : <?= json_encode($time_format) ?>,
-        services      : <?= json_encode($services) ?>,
-        categories    : <?= json_encode($categories) ?>,
-        timezones     : <?= json_encode($timezones) ?>,
-        user          : {
-            id        : <?= $user_id ?>,
-            email     : <?= json_encode($user_email) ?>,
-            timezone  : <?= json_encode($timezone) ?>,
-            role_slug : <?= json_encode($role_slug) ?>,
+        csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
+        baseUrl: <?= json_encode($base_url) ?>,
+        dateFormat: <?= json_encode($date_format) ?>,
+        timeFormat: <?= json_encode($time_format) ?>,
+        services: <?= json_encode($services) ?>,
+        categories: <?= json_encode($categories) ?>,
+        timezones: <?= json_encode($timezones) ?>,
+        user: {
+            id: <?= $user_id ?>,
+            email: <?= json_encode($user_email) ?>,
+            timezone: <?= json_encode($timezone) ?>,
+            role_slug: <?= json_encode($role_slug) ?>,
             privileges: <?= json_encode($privileges) ?>
         }
     };
diff --git a/application/views/backend/settings.php b/application/views/backend/settings.php
index a8157504..f4e95575 100755
--- a/application/views/backend/settings.php
+++ b/application/views/backend/settings.php
@@ -6,23 +6,23 @@
 <script src="<?= asset_url('assets/ext/jquery-jeditable/jquery.jeditable.min.js') ?>"></script>
 <script>
     var GlobalVariables = {
-        'csrfToken'     : <?= json_encode($this->security->get_csrf_hash()) ?>,
-        'baseUrl'       : <?= json_encode($base_url) ?>,
-        'dateFormat'    : <?= json_encode($date_format) ?>,
-        'firstWeekday'  : <?= json_encode($first_weekday); ?>,
-        'timeFormat'    : <?= json_encode($time_format) ?>,
-        'userSlug'      : <?= json_encode($role_slug) ?>,
-        'timezones'     : <?= json_encode($timezones) ?>,
-        'settings'      : {
-            'system'    : <?= json_encode($system_settings) ?>,
-            'user'      : <?= json_encode($user_settings) ?>
+        csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
+        baseUrl: <?= json_encode($base_url) ?>,
+        dateFormat: <?= json_encode($date_format) ?>,
+        firstWeekday: <?= json_encode($first_weekday); ?>,
+        timeFormat: <?= json_encode($time_format) ?>,
+        userSlug: <?= json_encode($role_slug) ?>,
+        timezones: <?= json_encode($timezones) ?>,
+        settings: {
+            system: <?= json_encode($system_settings) ?>,
+            user: <?= json_encode($user_settings) ?>
         },
-        'user'          : {
-            'id'        : <?= $user_id ?>,
-            'email'     : <?= json_encode($user_email) ?>,
-            'timezone'  : <?= json_encode($timezone) ?>,
-            'role_slug' : <?= json_encode($role_slug) ?>,
-            'privileges': <?= json_encode($privileges) ?>
+        user: {
+            id: <?= $user_id ?>,
+            email: <?= json_encode($user_email) ?>,
+            timezone: <?= json_encode($timezone) ?>,
+            role_slug: <?= json_encode($role_slug) ?>,
+            privileges: <?= json_encode($privileges) ?>
         }
     };
 
diff --git a/application/views/backend/users.php b/application/views/backend/users.php
index fd1d8a80..2605f6bb 100755
--- a/application/views/backend/users.php
+++ b/application/views/backend/users.php
@@ -7,24 +7,24 @@
 <script src="<?= asset_url('assets/ext/jquery-jeditable/jquery.jeditable.min.js') ?>"></script>
 <script>
     var GlobalVariables = {
-        csrfToken         : <?= json_encode($this->security->get_csrf_hash()) ?>,
-        baseUrl           : <?= json_encode($base_url) ?>,
-        dateFormat        : <?= json_encode($date_format) ?>,
-        firstWeekday      : <?= json_encode($first_weekday); ?>,
-        timeFormat        : <?= json_encode($time_format) ?>,
-        admins            : <?= json_encode($admins) ?>,
-        providers         : <?= json_encode($providers) ?>,
-        secretaries       : <?= json_encode($secretaries) ?>,
-        services          : <?= json_encode($services) ?>,
-        timezones         : <?= json_encode($timezones) ?>,
-        workingPlan       : <?= json_encode(json_decode($working_plan)) ?>,
-        extraWorkingPlan  : <?= json_encode(json_decode($extra_working_plan)) ?>,
-        user           : {
-            id         : <?= $user_id ?>,
-            email      : <?= json_encode($user_email) ?>,
-            timezone   : <?= json_encode($timezone) ?>,
-            role_slug  : <?= json_encode($role_slug) ?>,
-            privileges : <?= json_encode($privileges) ?>
+        csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
+        baseUrl: <?= json_encode($base_url) ?>,
+        dateFormat: <?= json_encode($date_format) ?>,
+        firstWeekday: <?= json_encode($first_weekday); ?>,
+        timeFormat: <?= json_encode($time_format) ?>,
+        admins: <?= json_encode($admins) ?>,
+        providers: <?= json_encode($providers) ?>,
+        secretaries: <?= json_encode($secretaries) ?>,
+        services: <?= json_encode($services) ?>,
+        timezones: <?= json_encode($timezones) ?>,
+        workingPlan: <?= json_encode(json_decode($working_plan)) ?>,
+        extraWorkingPlan: <?= json_encode(json_decode($extra_working_plan)) ?>,
+        user: {
+            id: <?= $user_id ?>,
+            email: <?= json_encode($user_email) ?>,
+            timezone: <?= json_encode($timezone) ?>,
+            role_slug: <?= json_encode($role_slug) ?>,
+            privileges: <?= json_encode($privileges) ?>
         }
     };
 
diff --git a/application/views/general/installation.php b/application/views/general/installation.php
index 6f80f1bd..a627cf7f 100755
--- a/application/views/general/installation.php
+++ b/application/views/general/installation.php
@@ -171,8 +171,8 @@
 
     <script>
         var GlobalVariables = {
-            'csrfToken': <?= json_encode($this->security->get_csrf_hash()) ?>,
-            'baseUrl': <?= json_encode(config('base_url')) ?>
+            csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
+            baseUrl: <?= json_encode(config('base_url')) ?>
         };
 
         var EALang = <?= json_encode($this->lang->language) ?>;
diff --git a/application/views/user/forgot_password.php b/application/views/user/forgot_password.php
index 42603641..50b34419 100644
--- a/application/views/user/forgot_password.php
+++ b/application/views/user/forgot_password.php
@@ -53,10 +53,10 @@
 
     <script>
         var GlobalVariables = {
-            'csrfToken': <?= json_encode($this->security->get_csrf_hash()) ?>,
-            'baseUrl': <?= json_encode(config('base_url')) ?>,
-            'AJAX_SUCCESS': 'SUCCESS',
-            'AJAX_FAILURE': 'FAILURE'
+            csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
+            baseUrl: <?= json_encode(config('base_url')) ?>,
+            AJAX_SUCCESS: 'SUCCESS',
+            AJAX_FAILURE: 'FAILURE'
         };
 
         var EALang = <?= json_encode($this->lang->language) ?>;
diff --git a/application/views/user/login.php b/application/views/user/login.php
index 740aacb0..26ffe6e6 100644
--- a/application/views/user/login.php
+++ b/application/views/user/login.php
@@ -45,11 +45,11 @@
 
     <script>
         var GlobalVariables = {
-            'csrfToken': <?= json_encode($this->security->get_csrf_hash()) ?>,
-            'baseUrl': <?= json_encode($base_url) ?>,
-            'destUrl': <?= json_encode($dest_url) ?>,
-            'AJAX_SUCCESS': 'SUCCESS',
-            'AJAX_FAILURE': 'FAILURE'
+            csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
+            baseUrl: <?= json_encode($base_url) ?>,
+            destUrl: <?= json_encode($dest_url) ?>,
+            AJAX_SUCCESS: 'SUCCESS',
+            AJAX_FAILURE: 'FAILURE'
         };
 
         var EALang = <?= json_encode($this->lang->language) ?>;