diff --git a/templates/keystone-httpd.conf.j2 b/templates/keystone-httpd.conf.j2
index b19b9844..b55485c0 100644
--- a/templates/keystone-httpd.conf.j2
+++ b/templates/keystone-httpd.conf.j2
@@ -20,9 +20,9 @@ Listen {{ keystone_web_server_bind_address }}:{{ keystone_service_port }}
     {% endif -%}
     Header set X-Frame-Options "{{ keystone_x_frame_options | default ('DENY') }}"
 
-    {% if (keystone_ssl | bool) and (keystone_external_ssl | bool) %}
+    {% if (keystone_external_ssl | bool) %}
     RequestHeader set {{ keystone_secure_proxy_ssl_header }} "https"
-    {% elif not (keystone_ssl | bool) and (keystone_external_ssl | bool) %}
+    {% else %}
     RequestHeader set {{ keystone_secure_proxy_ssl_header }} "http"
     {% endif %}