diff --git a/files/etc/nginx/conf.d/headers.conf b/files/etc/nginx/conf.d/headers.conf
index 8c611e5..a69e426 100644
--- a/files/etc/nginx/conf.d/headers.conf
+++ b/files/etc/nginx/conf.d/headers.conf
@@ -1,6 +1,11 @@
+more_clear_headers x-powered-by;
+more_clear_headers server;
+more_clear_headers referrer-policy;
+more_clear_headers x-xss-protection;
+more_clear_headers referrer-policy;
+more_clear_headers x-content-type-options;
+
 add_header X-Content-Type-Options nosniff;
 add_header X-XSS-Protection "1; mode=block";
 add_header X-Frame-Options "SAMEORIGIN" always;
 add_header Permissions-Policy interest-cohort=();
-more_clear_headers x-powered-by;
-more_clear_headers server;
diff --git a/templates/vhosts/partials/errors.j2 b/templates/vhosts/partials/errors.j2
index fadbe87..e241688 100644
--- a/templates/vhosts/partials/errors.j2
+++ b/templates/vhosts/partials/errors.j2
@@ -1,4 +1,4 @@
-	{% if errorpage is defined and errorpage is False %}
+	{% if item.remove_error_pages is not defined %}
 	error_page 401 /401.html;
 	location = /401.html {
 		root /var/www/html/errors/;