diff --git a/data/templates/netflow/uacctd.conf.tmpl b/data/templates/netflow/uacctd.conf.tmpl
index 1ee65a28e..a7d027048 100644
--- a/data/templates/netflow/uacctd.conf.tmpl
+++ b/data/templates/netflow/uacctd.conf.tmpl
@@ -1,75 +1,75 @@
 # Genereated from VyOS configuration
 daemonize: true
 promisc: false
 pidfile: /var/run/uacctd.pid
 uacctd_group: 2
 uacctd_nl_size: 2097152
 snaplen: {{ snaplen }}
 {% if templatecfg['enable-egress'] != none %}
 aggregate: in_iface,out_iface,src_mac,dst_mac,vlan,src_host,dst_host,src_port,dst_port,proto,tos,flows
 {% else %}
 aggregate: in_iface,src_mac,dst_mac,vlan,src_host,dst_host,src_port,dst_port,proto,tos,flows
 {% endif %}
 plugin_pipe_size: {{ templatecfg['plugin_pipe_size'] }}
 plugin_buffer_size: {{ templatecfg['plugin_buffer_size'] }}
 {% if templatecfg['syslog-facility'] != none %}
 syslog: {{ templatecfg['syslog-facility'] }}
 {% endif %}
 {% if templatecfg['disable-imt'] == none %}
 imt_path: /tmp/uacctd.pipe
 imt_mem_pools_number: 169
 {% endif %}
 plugins: {% if templatecfg['netflow']['servers'] != none %}
 {%   for server in templatecfg['netflow']['servers'] %}
 {%     if loop.last %}nfprobe[nf_{{ server['address'] | dot_colon_to_dash }}]{% else %}nfprobe[nf_{{ server['address'] | dot_colon_to_dash }}],{% endif %}
 {%   endfor %}
 {% set plugins_presented = true %}
 {% endif %}
 {% if templatecfg['sflow']['servers'] != none %}
 {%   if plugins_presented %}
 {%     for server in templatecfg['sflow']['servers'] %},sfprobe[sf_{{ server['address'] }}]{% endfor %}
 {%   else %}
 {%     for server in templatecfg['sflow']['servers'] %}
-{%       if loop.last %}sfprobe[sf_{{ server['address'] }}]{% else %}sfprobe[sf_{{ server['address'] }}],{% endif %}
+{%       if loop.last %}sfprobe[sf_{{ server['address'] | dot_colon_to_dash }}]{% else %}sfprobe[sf_{{ server['address'] | dot_colon_to_dash }}],{% endif %}
 {%     endfor %}
 {%   endif %}
 {% set plugins_presented = true %}
 {% endif %}
 {% if templatecfg['disable-imt'] == none %}
 {%   if plugins_presented %},memory{% else %}memory{% endif %}
 {% endif %}
 
 {% if templatecfg['netflow']['servers'] != none %}
 {% for server in templatecfg['netflow']['servers'] %}
 nfprobe_receiver[nf_{{ server['address'] | dot_colon_to_dash }}]: {{ server['address'] | bracketize_ipv6 }}:{{ server['port'] }}
 nfprobe_version[nf_{{ server['address'] | dot_colon_to_dash }}]: {{ templatecfg['netflow']['version'] }}
 {% if templatecfg['netflow']['engine-id'] != none %}
 nfprobe_engine[nf_{{ server['address'] | dot_colon_to_dash }}]: {{ templatecfg['netflow']['engine-id'] }}
 {% endif %}
 {% if templatecfg['netflow']['max-flows'] != none %}
 nfprobe_maxflows[nf_{{ server['address'] | dot_colon_to_dash }}]: {{ templatecfg['netflow']['max-flows'] }}
 {% endif %}
 {% if templatecfg['netflow']['sampling-rate'] != none %}
 sampling_rate[nf_{{ server['address'] | dot_colon_to_dash }}]: {{ templatecfg['netflow']['sampling-rate'] }}
 {% endif %}
 {% if templatecfg['netflow']['source-ip'] != none %}
 nfprobe_source_ip[nf_{{ server['address'] | dot_colon_to_dash }}]: {{ templatecfg['netflow']['source-ip'] }}
 {% endif %}
 {% if templatecfg['netflow']['timeout_string'] != '' %}
 nfprobe_timeouts[nf_{{ server['address'] | dot_colon_to_dash }}]: {{ templatecfg['netflow']['timeout_string'] }}
 {% endif %}
 {% endfor %}
 {% endif %}
 
 {% if templatecfg['sflow']['servers'] != none %}
 {% for server in templatecfg['sflow']['servers'] %}
 sfprobe_receiver[sf_{{ server['address'] | dot_colon_to_dash }}]: {{ server['address'] | bracketize_ipv6 }}:{{ server['port'] }}
 sfprobe_agentip[sf_{{ server['address'] | dot_colon_to_dash }}]: {{ templatecfg['sflow']['agent-address'] }}
 {% if templatecfg['sflow']['sampling-rate'] != none %}
 sampling_rate[sf_{{ server['address'] | dot_colon_to_dash }}]: {{ templatecfg['sflow']['sampling-rate'] }}
 {% endif %}
 {% if templatecfg['sflow']['source-address'] != none %}
 sfprobe_source_ip[sf_{{ server['address'] | dot_colon_to_dash }}]: {{ templatecfg['sflow']['source-address'] }}
 {% endif %}
 {% endfor %}
 {% endif %}