diff --git a/bin/vhost-add b/bin/vhost-add
index 1895dcb..3a50223 100755
--- a/bin/vhost-add
+++ b/bin/vhost-add
@@ -101,7 +101,7 @@ fi
 
 if [ "$WEB_HTTPS" = "yes" ]; then
 	VHOST_FILE_SA="/etc/apache2/sites-available/${DOMAIN}.${WEB_HTTPS_PORT}.conf"
-	VHOST_FILE_SE="/etc/apache2/sites-enabled/${DOMAIN}.${WEB_HTTP_PORT}.conf"
+	VHOST_FILE_SE="/etc/apache2/sites-enabled/${DOMAIN}.${WEB_HTTPS_PORT}.conf"
 
 	PORT=$WEB_HTTPS_PORT template vhost-https > "$VHOST_FILE_SA"
 
diff --git a/src/templates/vhost-http.twig b/src/templates/vhost-http.twig
index 4dc6f3c..497a0c0 100644
--- a/src/templates/vhost-http.twig
+++ b/src/templates/vhost-http.twig
@@ -9,7 +9,7 @@
 	SuexecUserGroup {{ SYSTEM_USER_USERNAME }} {{ SYSTEM_USER_GROUP }}
 	ErrorLog /services/web/logs/{{ DOMAIN }}.log
 	CustomLog /services/web/logs/{{ DOMAIN }}.log combined
-{% if WEB_HTTPS_FORCE = "yes" %}
+{% if WEB_HTTPS_FORCE == "yes" %}
 
 	Redirect permanent / https://{{ DOMAIN }}/
 {% endif %}
@@ -29,6 +29,6 @@
 	    </FilesMatch>'
 	</IfModule>
 {% endif %}
-{% block extra %}{% endblock %}
+{% block extra %}{% endblock extra %}
 </VirtualHost>
-{% endblock %}
+{% endblock body %}
diff --git a/src/templates/vhost-https.twig b/src/templates/vhost-https.twig
index 1947427..a1f92d3 100644
--- a/src/templates/vhost-https.twig
+++ b/src/templates/vhost-https.twig
@@ -20,4 +20,4 @@
 
 	BrowserMatch "MSIE [2-6]" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0
 	BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
-{% endblock %}
+{% endblock extra %}