diff --git a/templates/httpcheck.conf b/templates/httpcheck.conf
index 33dbe652f3bc77b39e90e254fe6a505d86a371ac..9a7f4942f6797769e037a6089b9f817a55d6353c 100644
--- a/templates/httpcheck.conf
+++ b/templates/httpcheck.conf
@@ -123,7 +123,7 @@ redirect: no
 
 {{ site.uptime.name|to_uuid }}:
     name: {{ site.uptime.name }}
-    url: {{ site.protocol|default('https') }}://{% if site.apache_auth is defined and site.apache_auth.user is defined and site.apache_auth.password is defined %}{{ site.apache_auth.user }}:{{ site.apache_auth.password }}@{% endif %}{{ site.domain }}{% if site.uptime.path is defined %}/{{ site.uptime.path }}{% endif %}
+    url: {{ site.protocol|default('https') }}://{{ site.domain }}{% if site.uptime.path is defined %}/{{ site.uptime.path }}{% endif %}
 
 {% if site.uptime.pollerParams|default(false) and site.uptime.pollerParams.body|default(false) %}
     regex: {{ site.uptime.pollerParams.body|regex_escape() }}
@@ -131,8 +131,8 @@ redirect: no
 {% if site.uptime.timeout|default(false) %}
     timeout: {{ site.uptime.timeout }}
 {% endif %}
-{% if item.header is defined %}
-    header: {{ item.header|to_json }}
+{% if site.uptime.header is defined %}
+    header: {{ site.uptime.header|to_json }}
 {% endif %}
 {% endif %}
 {% endfor %}
@@ -142,7 +142,7 @@ redirect: no
 
 {{ site.uptime.name|to_uuid }}:
     name: {{ site.uptime.name }}
-    url: {{ site.protocol|default('https') }}://{% if site.apache_auth is defined and site.apache_auth.user is defined and site.apache_auth.password is defined %}{{ site.apache_auth.user }}:{{ site.apache_auth.password }}@{% endif %}{{ site.domain }}{% if site.uptime.path is defined %}/{{ site.uptime.path }}{% endif %}
+    url: {{ site.protocol|default('https') }}://{{ site.domain }}{% if site.uptime.path is defined %}/{{ site.uptime.path }}{% endif %}
 
 {% if site.uptime.pollerParams|default(false) and site.uptime.pollerParams.body|default(false) %}
     regex: {{ site.uptime.pollerParams.body|regex_escape() }}
@@ -150,8 +150,8 @@ redirect: no
 {% if site.uptime.timeout|default(false) %}
     timeout: {{ site.uptime.timeout }}
 {% endif %}
-{% if item.header is defined %}
-    header: {{ item.header|to_json }}
+{% if site.uptime.header is defined %}
+    header: {{ site.uptime.header|to_json }}
 {% endif %}
 {% endif %}
 {% endfor %}