diff --git a/templates/vhost/vhost_header.erb b/templates/vhost/vhost_header.erb
index 35cc6b65d..3339b1668 100644
--- a/templates/vhost/vhost_header.erb
+++ b/templates/vhost/vhost_header.erb
@@ -1,11 +1,11 @@
 server {
   listen                <%= @listen_ip %>:<%= @listen_port %><% if @listen_options %> <%= @listen_options %><% end %>;
 <% # check to see if ipv6 support exists in the kernel before applying %>
-<% if @ipv6_enable == 'true' && (defined? ipaddress6) %>
-  listen [<%= ipv6_listen_ip %>]:<%= @ipv6_listen_port %> <% if @ipv6_listen_options %><%= @ipv6_listen_options %><% end %> ipv6only=on;
+<% if @ipv6_enable == 'true' && (defined? @ipaddress6) %>
+  listen [<%= @ipv6_listen_ip %>]:<%= @ipv6_listen_port %> <% if @ipv6_listen_options %><%= @ipv6_listen_options %><% end %> ipv6only=on;
 <% end %>
   server_name           <%= @rewrite_www_to_non_www ? @name.gsub(/^www\./, '') : @server_name.join(" ") %>;
-<% if defined? auth_basic -%>
+<% if defined? @auth_basic -%>
   auth_basic           "<%= @auth_basic %>";
 <% end -%>
 <% if defined? auth_basic_user_file -%>