diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile
index c3c56aedf..7404101dd 100644
--- a/www/c-icap/Makefile
+++ b/www/c-icap/Makefile
@@ -2,6 +2,6 @@ PLUGIN_NAME=		c-icap
 PLUGIN_VERSION=		1.8
 PLUGIN_COMMENT=		c-icap connects the web proxy with a virus scanner
 PLUGIN_DEPENDS=		c-icap c-icap-modules
-PLUGIN_MAINTAINER=	m.muenz@gmail.com
+PLUGIN_MAINTAINER=	andybinder@gmx.de
 
 .include "../../Mk/plugins.mk"
diff --git a/www/c-icap/src/opnsense/service/templates/OPNsense/CICAP/c-icap.conf b/www/c-icap/src/opnsense/service/templates/OPNsense/CICAP/c-icap.conf
index 8f25c2638..f2ea03556 100644
--- a/www/c-icap/src/opnsense/service/templates/OPNsense/CICAP/c-icap.conf
+++ b/www/c-icap/src/opnsense/service/templates/OPNsense/CICAP/c-icap.conf
@@ -42,15 +42,15 @@ ServerName {{ OPNsense.cicap.general.servername }}
 {% else %}
 ServerName {{ system.hostname }}
 {% endif %}
+{% if not helpers.empty('OPNsense.cicap.general.listenaddress') %}
+acl localserver srvip {{ OPNsense.cicap.general.listenaddress }}
+{% else %}
+acl localserver srvip ::1
+{% endif %}
 {% if helpers.exists('OPNsense.cicap.general.localSquid') and OPNsense.cicap.general.localSquid == '1' %}
 {%      if helpers.exists('OPNsense.proxy.forward.icap.SendUsername') and OPNsense.proxy.forward.icap.SendUsername == '1' %}
 RemoteProxyUsers on
 acl AUTH auth *
-{%   if not helpers.empty('OPNsense.cicap.general.listenaddress') %}
-acl localserver srvip {{ OPNsense.cicap.general.listenaddress }}
-{%      else %}
-acl localserver srvip ::1
-{% endif %}
 icap_access allow AUTH localserver
 {%      else %}
 RemoteProxyUsers off
@@ -66,11 +66,6 @@ RemoteProxyUserHeader {{OPNsense.proxy.forward.icap.UsernameHeader}}
 {% else %}
 RemoteProxyUsers on
 acl AUTH auth *
-{%   if not helpers.empty('OPNsense.cicap.general.listenaddress') %}
-acl localserver srvip {{ OPNsense.cicap.general.listenaddress }}
-{%      else %}
-acl localserver srvip ::1
-{% endif %}
 icap_access allow AUTH localserver
 RemoteProxyUserHeaderEncoded on
 RemoteProxyUserHeader X-Authenticated-User