diff --git a/application/controllers/About.php b/application/controllers/About.php
index b4e2d004..fd1e7290 100644
--- a/application/controllers/About.php
+++ b/application/controllers/About.php
@@ -75,6 +75,6 @@ class About extends EA_Controller {
             'privileges' => $this->roles_model->get_permissions_by_slug($role_slug),
         ]);
 
-        $this->load->view('pages/about', html_vars());
+        $this->load->view('pages/about');
     }
 }
diff --git a/application/controllers/Account.php b/application/controllers/Account.php
index cf81a547..f11a1675 100644
--- a/application/controllers/Account.php
+++ b/application/controllers/Account.php
@@ -74,7 +74,7 @@ class Account extends EA_Controller {
             'timezones' => $this->timezones->to_grouped_array(),
         ]);
 
-        $this->load->view('pages/account', html_vars());
+        $this->load->view('pages/account');
     }
 
     /**
diff --git a/application/controllers/Admins.php b/application/controllers/Admins.php
index aadd2f9a..4f12b8bb 100644
--- a/application/controllers/Admins.php
+++ b/application/controllers/Admins.php
@@ -74,7 +74,7 @@ class Admins extends EA_Controller {
             'privileges' => $this->roles_model->get_permissions_by_slug($role_slug),
         ]);
 
-        $this->load->view('pages/admins', html_vars());
+        $this->load->view('pages/admins');
     }
 
     /**
diff --git a/application/controllers/Booking.php b/application/controllers/Booking.php
index 34959f47..8a6a69fa 100755
--- a/application/controllers/Booking.php
+++ b/application/controllers/Booking.php
@@ -130,7 +130,7 @@ class Booking extends EA_Controller {
                     'matomo_analytics_url' => $matomo_analytics_url
                 ]);
 
-                $this->load->view('pages/booking_message', html_vars());
+                $this->load->view('pages/booking_message');
 
                 return;
             }
@@ -159,7 +159,7 @@ class Booking extends EA_Controller {
                     'matomo_analytics_url' => $matomo_analytics_url
                 ]);
 
-                $this->load->view('pages/booking_message', html_vars());
+                $this->load->view('pages/booking_message');
 
                 return;
             }
@@ -233,7 +233,7 @@ class Booking extends EA_Controller {
             'customer_data' => $customer,
         ]);
 
-        $this->load->view('pages/booking', html_vars());
+        $this->load->view('pages/booking');
     }
 
     /**
diff --git a/application/controllers/Booking_cancellation.php b/application/controllers/Booking_cancellation.php
index b6de9364..7b8c987d 100755
--- a/application/controllers/Booking_cancellation.php
+++ b/application/controllers/Booking_cancellation.php
@@ -100,6 +100,6 @@ class Booking_cancellation extends EA_Controller {
             'exceptions' => $exceptions
         ]);
 
-        $this->load->view('pages/booking_message', html_vars());
+        $this->load->view('pages/booking_message');
     }
 }
diff --git a/application/controllers/Booking_confirmation.php b/application/controllers/Booking_confirmation.php
index 72a12280..a84b6292 100755
--- a/application/controllers/Booking_confirmation.php
+++ b/application/controllers/Booking_confirmation.php
@@ -90,6 +90,6 @@ class Booking_confirmation extends EA_Controller {
             'matomo_analytics_url' => setting('matomo_analytics_url'),
         ]);
 
-        $this->load->view('pages/booking_confirmation', html_vars());
+        $this->load->view('pages/booking_confirmation');
     }
 }
diff --git a/application/controllers/Booking_settings.php b/application/controllers/Booking_settings.php
index 0f2eecdf..e680e5c5 100644
--- a/application/controllers/Booking_settings.php
+++ b/application/controllers/Booking_settings.php
@@ -75,7 +75,7 @@ class Booking_settings extends EA_Controller {
             'user_display_name' => $this->accounts->get_user_display_name($user_id),
         ]);
 
-        $this->load->view('pages/booking_settings', html_vars());
+        $this->load->view('pages/booking_settings');
     }
 
     /**
diff --git a/application/controllers/Business_settings.php b/application/controllers/Business_settings.php
index 114f9c3e..7e94873a 100644
--- a/application/controllers/Business_settings.php
+++ b/application/controllers/Business_settings.php
@@ -77,7 +77,7 @@ class Business_settings extends EA_Controller {
             'user_display_name' => $this->accounts->get_user_display_name($user_id),
         ]);
 
-        $this->load->view('pages/business_settings', html_vars());
+        $this->load->view('pages/business_settings');
     }
 
     /**
diff --git a/application/controllers/Calendar.php b/application/controllers/Calendar.php
index c6c1b3d8..7fc4a6ba 100644
--- a/application/controllers/Calendar.php
+++ b/application/controllers/Calendar.php
@@ -138,7 +138,7 @@ class Calendar extends EA_Controller {
             'require_notes' => setting('require_notes'),
         ]);
 
-        $this->load->view('pages/calendar', html_vars());
+        $this->load->view('pages/calendar');
     }
 
     /**
diff --git a/application/controllers/Categories.php b/application/controllers/Categories.php
index 25057398..c356db88 100644
--- a/application/controllers/Categories.php
+++ b/application/controllers/Categories.php
@@ -72,7 +72,7 @@ class Categories extends EA_Controller {
             'privileges' => $this->roles_model->get_permissions_by_slug($role_slug),
         ]);
 
-        $this->load->view('pages/categories', html_vars());
+        $this->load->view('pages/categories');
     }
 
     /**
diff --git a/application/controllers/Customers.php b/application/controllers/Customers.php
index 8059b2b2..a8e275a3 100644
--- a/application/controllers/Customers.php
+++ b/application/controllers/Customers.php
@@ -104,7 +104,7 @@ class Customers extends EA_Controller {
             'available_languages' => config('available_languages'),
         ]);
 
-        $this->load->view('pages/customers', html_vars());
+        $this->load->view('pages/customers');
     }
 
     /**
diff --git a/application/controllers/General_settings.php b/application/controllers/General_settings.php
index b5b08b53..aa4cf180 100644
--- a/application/controllers/General_settings.php
+++ b/application/controllers/General_settings.php
@@ -66,7 +66,7 @@ class General_settings extends EA_Controller {
             'user_display_name' => $this->accounts->get_user_display_name($user_id),
         ]);
 
-        $this->load->view('pages/general_settings', html_vars());
+        $this->load->view('pages/general_settings');
     }
 
     /**
diff --git a/application/controllers/Legal_settings.php b/application/controllers/Legal_settings.php
index 896ba30b..4c6196ce 100644
--- a/application/controllers/Legal_settings.php
+++ b/application/controllers/Legal_settings.php
@@ -66,7 +66,7 @@ class Legal_settings extends EA_Controller {
             'user_display_name' => $this->accounts->get_user_display_name($user_id),
         ]);
 
-        $this->load->view('pages/legal_settings', html_vars());
+        $this->load->view('pages/legal_settings');
     }
 
     /**
diff --git a/application/controllers/Login.php b/application/controllers/Login.php
index 9e825dac..ccc83b4a 100644
--- a/application/controllers/Login.php
+++ b/application/controllers/Login.php
@@ -45,7 +45,7 @@ class Login extends EA_Controller {
             'company_name' => setting('company_name')
         ]);
         
-        $this->load->view('pages/login', html_vars());
+        $this->load->view('pages/login');
     }
 
     /**
diff --git a/application/controllers/Logout.php b/application/controllers/Logout.php
index 5ddd21d7..c882ed02 100644
--- a/application/controllers/Logout.php
+++ b/application/controllers/Logout.php
@@ -32,6 +32,6 @@ class Logout extends EA_Controller {
             'company_name' => $company_name
         ]);
 
-        $this->load->view('pages/logout', html_vars());
+        $this->load->view('pages/logout');
     }
 }
diff --git a/application/controllers/Providers.php b/application/controllers/Providers.php
index a2d54512..27c543d0 100644
--- a/application/controllers/Providers.php
+++ b/application/controllers/Providers.php
@@ -88,7 +88,7 @@ class Providers extends EA_Controller {
             'services' => $this->services_model->get(),
         ]);
 
-        $this->load->view('pages/providers', html_vars());
+        $this->load->view('pages/providers');
     }
 
     /**
diff --git a/application/controllers/Recovery.php b/application/controllers/Recovery.php
index a2559574..f8ad893a 100644
--- a/application/controllers/Recovery.php
+++ b/application/controllers/Recovery.php
@@ -42,7 +42,7 @@ class Recovery extends EA_Controller {
             'company_name' => $company_name
         ]); 
         
-        $this->load->view('pages/recovery', html_vars());
+        $this->load->view('pages/recovery');
     }
     
     /**
diff --git a/application/controllers/Secretaries.php b/application/controllers/Secretaries.php
index ab4aa1ef..2943e2d4 100644
--- a/application/controllers/Secretaries.php
+++ b/application/controllers/Secretaries.php
@@ -88,7 +88,7 @@ class Secretaries extends EA_Controller {
             'providers' => $this->providers_model->get(),
         ]);
 
-        $this->load->view('pages/secretaries', html_vars());
+        $this->load->view('pages/secretaries');
     }
 
     /**
diff --git a/application/controllers/Services.php b/application/controllers/Services.php
index 5e005583..d2f228d0 100644
--- a/application/controllers/Services.php
+++ b/application/controllers/Services.php
@@ -72,7 +72,7 @@ class Services extends EA_Controller {
             'privileges' => $this->roles_model->get_permissions_by_slug($role_slug),
         ]);
 
-        $this->load->view('pages/services', html_vars());
+        $this->load->view('pages/services');
     }
 
     /**