diff --git a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
index 536ce0814..2a41875e1 100644
--- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
+++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
@@ -1106,11 +1106,11 @@ resolvers {{resolver.id}}
 # Mailer: {{mailer.name}}
 mailers {{mailer.id}}
     timeout mail {{mailer.timeout}}s
-{%             if mailer.mailservers|default("") != "" %}
-{%               for mailserver in mailer.mailservers.split(",") %}
+{%         if mailer.mailservers|default("") != "" %}
+{%           for mailserver in mailer.mailservers.split(",") %}
     mailer {{mailserver}} {{mailserver}}
-{%               endfor %}
-{%             endif %}
+{%           endfor %}
+{%         endif %}
 
 {%       else %}
 # NOTE: Mailer {{mailer.name}} ignored: not configured in any backend
@@ -1518,10 +1518,10 @@ backend {{backend.name}}
 {%             else %}
 {#               # server type #}
 {%               set server_basics = [] %}
-{%               if server_data.type|default("") == 'static' %}
-{%                 do server_basics.append('server ' ~ server_data.name ~ ' ' ~ server_data.address) %}
-{%               else %}
+{%               if server_data.type|default("") == 'template' %}
 {%                 do server_basics.append('server-template ' ~ server_data.name ~ ' ' ~ server_data.number ~ ' ' ~ server_data.serviceName) %}
+{%               else %}
+{%                 do server_basics.append('server ' ~ server_data.name ~ ' ' ~ server_data.address) %}
 {%               endif %}
 {#               # collect optional server parameters #}
 {%               set server_options = [] %}