diff --git a/net/siproxd/Makefile b/net/siproxd/Makefile
index 8f93e88bd..c54982e2d 100644
--- a/net/siproxd/Makefile
+++ b/net/siproxd/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		siproxd
-PLUGIN_VERSION=		0.1
+PLUGIN_VERSION=		0.2
 PLUGIN_COMMENT=		Siproxd is a proxy daemon for the SIP protocol
 PLUGIN_DEPENDS=		siproxd
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/forms/general.xml b/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/forms/general.xml
index b0c537ce3..855274706 100644
--- a/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/forms/general.xml
+++ b/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/forms/general.xml
@@ -88,112 +88,118 @@
         <type>checkbox</type>
         <help>De-Jitter outbound packets (defaults to 0).</help>
     </field>
+    <field>
+        <id>general.proxy_auth_enable</id>
+        <label>Enable Proxy authentication</label>
+        <type>checkbox</type>
+        <help>Whether or not to enable authentication for clients to Siproxd. If checked please set up clients in the users tab.</help>
+    </field>
     <field>
         <id>general.tcp_timeout</id>
         <label>TCP timeout</label>
         <type>text</type>
-	    <help>Time in seconds when an inactive TCP session will be disconnected.</help>
+        <help>Time in seconds when an inactive TCP session will be disconnected.</help>
     </field>
     <field>
         <id>general.tcp_connect_timeout</id>
         <label>TCP connect timeout</label>
         <type>text</type>
-	    <help>Time in milli seconds siproxd should wait until the connection is established.</help>
+        <help>Time in milli seconds siproxd should wait until the connection is established.</help>
     </field>
     <field>
         <id>general.tcp_keepalive</id>
         <label>TCP keepalive</label>
         <type>text</type>
-	    <help>Time in seconds how often siproxd should send an empty Sip-Keep-Alive to hold the connection.</help>
+        <help>Time in seconds how often siproxd should send an empty Sip-Keep-Alive to hold the connection.</help>
     </field>
     <field>
         <id>general.ua_string</id>
         <label>Useragent string</label>
         <type>text</type>
-	    <help>Siproxd will masquerade the interal UAs to this given string (optional).</help>
+        <help>Siproxd will masquerade the interal UAs to this given string (optional).</help>
     </field>
     <field>
         <id>general.use_rport</id>
         <label>Remote ports in VIA-Header</label>
         <type>dropdown</type>
-	    <help>This setting is only relevant for double nat scenarios, where default port 5060 would be replaced by a NAT device.</help>
+        <help>This setting is only relevant for double nat scenarios, where default port 5060 would be replaced by a NAT device.</help>
     </field>
     <field>
         <id>general.plugin_defaulttarget_enable</id>
         <label>Enable defaulttarget plugin</label>
         <type>checkbox</type>
-	    <help>Enable or disable the defaulttarget plugin.</help>
+        <help>Enable or disable the defaulttarget plugin.</help>
     </field>
     <field>
         <id>general.plugin_defaulttarget_log</id>
         <label>Enable defaulttarget logging</label>
         <type>checkbox</type>
-	    <help>Enable logging of defaulttarget plugin.</help>
+        <help>Enable logging of defaulttarget plugin.</help>
     </field>
     <field>
         <id>general.plugin_defaulttarget_target</id>
         <label>Default target account</label>
         <type>text</type>
-	    <help>Redirect all incoming calls to a given SIP-URI with format sip:internal@ip:port.</help>
+        <help>Redirect all incoming calls to a given SIP-URI with format sip:internal@ip:port.</help>
     </field>
    <field>
         <id>general.plugin_fix_bogus_via_enable</id>
         <label>Enable fix_bogus_via plugin</label>
         <type>checkbox</type>
-	    <help>Enable or disable the fix_bogus_via plugin.</help>
+        <help>Enable or disable the fix_bogus_via plugin.</help>
     </field>
     <field>
         <id>general.plugin_fix_bogus_via_networks</id>
         <label>Networks to replace VIA-Header</label>
         <type>text</type>
-	    <help>Give here a list of networks to replace the VIA-Header. Default should fit for most situations.</help>
+        <help>Give here a list of networks to replace the VIA-Header. Default should fit for most situations.</help>
     </field>
    <field>
         <id>general.plugin_fix_DTAG_enable</id>
         <label>Enable fix_DTAG_networks plugin</label>
         <type>checkbox</type>
-	    <help>Enable or disable the fix_DTAG_networks plugin.</help>
+        <help>Enable or disable the fix_DTAG_networks plugin.</help>
     </field>
     <field>
         <id>general.plugin_fix_DTAG_networks</id>
         <label>DTAG servers</label>
         <type>text</type>
-	    <help>List of networks where to apply the DTAG fix. Default should fit for most situations.</help>
+        <help>List of networks where to apply the DTAG fix. Default should fit for most situations.</help>
     </field>
    <field>
         <id>general.plugin_fbox_anoncall_enable</id>
         <label>Enable fbox_anoncall_networks plugin</label>
         <type>checkbox</type>
-	    <help>Enable or disable the fix_DTAG_networks plugin.</help>
+        <help>Enable or disable the fix_DTAG_networks plugin.</help>
     </field>
     <field>
         <id>general.plugin_fbox_anoncall_networks</id>
         <label>Network list for fbox anoncall plugin</label>
         <type>text</type>
-	    <help>List of networks where to apply the FritzBox Anoncall plugin. Default should fit for most situations.</help>
+        <help>List of networks where to apply the FritzBox Anoncall plugin. Default should fit for most situations.</help>
     </field>
    <field>
         <id>general.plugin_stun_server_enable</id>
         <label>Enable STUN plugin</label>
         <type>checkbox</type>
-	    <help>Enable or disable the STUN plugin.</help>
+        <help>Enable or disable the STUN plugin.</help>
     </field>
     <field>
         <id>general.plugin_stun_server_host</id>
         <label>STUN server</label>
         <type>text</type>
-	    <help>Here you can set the FQDN of your STUN server.</help>
+        <help>Here you can set the FQDN of your STUN server.</help>
     </field>
     <field>
         <id>general.plugin_stun_server_port</id>
         <label>STUN port</label>
         <type>text</type>
-	    <help>Here you can set the port of your STUN server.</help>
+        <help>Here you can set the port of your STUN server.</help>
     </field>
     <field>
         <id>general.plugin_stun_server_period</id>
         <label>STUN period</label>
         <type>text</type>
-	    <help>With STUN periond you can set the time in seconds how often to request for IP info from STUN server.</help>
+        <help>With STUN periond you can set the time in seconds how often to request for IP info from STUN server.</help>
     </field>
 </form>
diff --git a/net/siproxd/src/opnsense/mvc/app/models/OPNsense/Siproxd/General.xml b/net/siproxd/src/opnsense/mvc/app/models/OPNsense/Siproxd/General.xml
index 81c5a657e..57e9849e9 100644
--- a/net/siproxd/src/opnsense/mvc/app/models/OPNsense/Siproxd/General.xml
+++ b/net/siproxd/src/opnsense/mvc/app/models/OPNsense/Siproxd/General.xml
@@ -84,6 +84,10 @@
             <default>0</default>
             <Required>N</Required>
         </rtp_output_dejitter>
+        <proxy_auth_enable type="BooleanField">
+            <default>0</default>
+            <Required>N</Required>
+        </proxy_auth_enable>
         <tcp_timeout type="IntegerField">
             <default>600</default>
             <Required>Y</Required>
diff --git a/net/siproxd/src/opnsense/service/templates/OPNsense/Siproxd/siproxd.conf b/net/siproxd/src/opnsense/service/templates/OPNsense/Siproxd/siproxd.conf
index 0e8ce56d0..2c904eec1 100644
--- a/net/siproxd/src/opnsense/service/templates/OPNsense/Siproxd/siproxd.conf
+++ b/net/siproxd/src/opnsense/service/templates/OPNsense/Siproxd/siproxd.conf
@@ -2,10 +2,10 @@
 {% from 'OPNsense/Macros/interface.macro' import physical_interface %}
 
 {% if helpers.exists('OPNsense.siproxd.general.if_inbound') and OPNsense.siproxd.general.if_inbound != '' %}
-if_inbound  = {{ physical_interface('OPNsense.siproxd.general.if_inbound') }}
+if_inbound  = {{ physical_interface(OPNsense.siproxd.general.if_inbound) }}
 {% endif %}
 {% if helpers.exists('OPNsense.siproxd.general.if_outbound') and OPNsense.siproxd.general.if_outbound != '' %}
-if_outbound = {{ physical_interface('OPNsense.siproxd.general.if_outbound') }}
+if_outbound = {{ physical_interface(OPNsense.siproxd.general.if_outbound) }}
 {% endif %}
 
 {% if helpers.exists('OPNsense.siproxd.general.host_outbound') and OPNsense.siproxd.general.host_outbound != '' %}
@@ -52,11 +52,19 @@ rtp_dscp = {{ OPNsense.siproxd.general.rtp_dscp }}
 {% if helpers.exists('OPNsense.siproxd.general.sip_dscp') and OPNsense.siproxd.general.sip_dscp != '' %}
 sip_dscp = {{ OPNsense.siproxd.general.sip_dscp }}
 {% endif %}
-{% if helpers.exists('OPNsense.siproxd.general.rtp_input_dejitter') and OPNsense.siproxd.general.rtp_input_dejitter != '' %}
-rtp_input_dejitter  = {{ OPNsense.siproxd.general.rtp_input_dejitter }}
+{% if helpers.exists('OPNsense.siproxd.general.rtp_input_dejitter') and OPNsense.siproxd.general.rtp_input_dejitter == '1' %}
+rtp_input_dejitter  = 1
+{% else %}
+rtp_input_dejitter  = 0
 {% endif %}
-{% if helpers.exists('OPNsense.siproxd.general.rtp_output_dejitter') and OPNsense.siproxd.general.rtp_output_dejitter != '' %}
-rtp_output_dejitter = {{ OPNsense.siproxd.general.rtp_output_dejitter }}
+{% if helpers.exists('OPNsense.siproxd.general.rtp_output_dejitter') and OPNsense.siproxd.general.rtp_output_dejitter == '1' %}
+rtp_output_dejitter = 1
+{% else %}
+rtp_output_dejitter  = 0
+{% endif %}
+{% if helpers.exists('OPNsense.siproxd.general.proxy_auth_enable') and OPNsense.siproxd.general.proxy_auth_enable == '1' %}
+proxy_auth_realm = Authentication_Realm
+proxy_auth_pwfile = /usr/local/etc/siproxd_passwd.cfg
 {% endif %}
 {% if helpers.exists('OPNsense.siproxd.general.tcp_timeout') and OPNsense.siproxd.general.tcp_timeout != '' %}
 tcp_timeout = {{ OPNsense.siproxd.general.tcp_timeout }}
@@ -94,7 +102,7 @@ plugindir=/usr/local/lib/siproxd/
 
 {% if helpers.exists('OPNsense.siproxd.general.plugin_defaulttarget_enable') and OPNsense.siproxd.general.plugin_defaulttarget_enable == '1' %}
 load_plugin=plugin_defaulttarget.la
-{%   if helpers.exists('OPNsense.siproxd.general.plugin_defaulttarget_log') and OPNsense.siproxd.general.plugin_defaulttarget_log != '' %}
+{%   if helpers.exists('OPNsense.siproxd.general.plugin_defaulttarget_log') and OPNsense.siproxd.general.plugin_defaulttarget_log == '1' %}
 plugin_defaulttarget_log = 1
 {%   endif %}
 {%   if helpers.exists('OPNsense.siproxd.general.plugin_defaulttarget_target') and OPNsense.siproxd.general.plugin_defaulttarget_target != '' %}