diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index 16a6e4fac..e756875f2 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -199,9 +199,9 @@
       <%- if directory['shib_require_session'] and ! directory['shib_require_session'].empty? -%>
     ShibRequireSession <%= directory['shib_require_session'] %>
       <%- end -%>
-      <%- if directory['shib_request_settings'] -%>
-        <%- Array(directory['shib_request_settings']).each do |setting| -%>
-    ShibRequestSetting <%= setting %>
+      <%- if directory['shib_request_settings'] and ! directory['shib_request_settings'].empty? -%>
+        <%- directory['shib_request_settings'].each do |key,value| -%>
+    ShibRequestSetting <%= key %> <%= value %>
         <%- end -%>
       <%- end -%>
       <%- if directory['shib_use_headers'] and ! directory['shib_use_headers'].empty? -%>