diff --git a/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/Api/ServiceController.php b/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/Api/ServiceController.php
index b55220e02..27d7cafaf 100644
--- a/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/Api/ServiceController.php
+++ b/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/Api/ServiceController.php
@@ -44,7 +44,7 @@ class ServiceController extends ApiControllerBase
     /**
      * show current SIP registrations
      * @return array
-     */    
+     */
     public function showregistrationsAction()
     {
         $backend = new Backend();
diff --git a/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/forms/dialogEditSiproxdDomain.xml b/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/forms/dialogEditSiproxdDomain.xml
index d75374313..cd605aa8e 100644
--- a/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/forms/dialogEditSiproxdDomain.xml
+++ b/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/forms/dialogEditSiproxdDomain.xml
@@ -22,5 +22,5 @@
         <label>Port</label>
         <type>text</type>
         <help>Set the port for this host. Default should be fine for most cases.</help>
-    </field>    
+    </field>
 </form>
diff --git a/net/siproxd/src/opnsense/mvc/app/models/OPNsense/Siproxd/Domain.xml b/net/siproxd/src/opnsense/mvc/app/models/OPNsense/Siproxd/Domain.xml
index 0ae15550f..977c7d314 100644
--- a/net/siproxd/src/opnsense/mvc/app/models/OPNsense/Siproxd/Domain.xml
+++ b/net/siproxd/src/opnsense/mvc/app/models/OPNsense/Siproxd/Domain.xml
@@ -20,7 +20,7 @@
                 <port type="IntegerField">
                     <default>5060</default>
                     <Required>Y</Required>
-                </port>                
+                </port>
             </domain>
         </domains>
     </items>
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 b140e858f..81c5a657e 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
@@ -39,7 +39,7 @@
             <NetMaskRequired>Y</NetMaskRequired>
             <FieldSeparator>,</FieldSeparator>
             <Required>N</Required>
-        </hosts_deny_sip>        
+        </hosts_deny_sip>
         <sip_listen_port type="IntegerField">
             <default>5060</default>
             <Required>Y</Required>
@@ -56,7 +56,7 @@
             <default>7089</default>
             <Required>Y</Required>
             <MinimumValue>1</MinimumValue>
-            <MaximumValue>65535</MaximumValue>			
+            <MaximumValue>65535</MaximumValue>
         </rtp_port_high>
         <rtp_timeout type="IntegerField">
             <default>300</default>
@@ -68,13 +68,13 @@
             <default>46</default>
             <Required>Y</Required>
             <MinimumValue>0</MinimumValue>
-            <MaximumValue>64</MaximumValue>			
+            <MaximumValue>64</MaximumValue>
         </rtp_dscp>
         <sip_dscp type="IntegerField">
             <default>0</default>
             <Required>Y</Required>
             <MinimumValue>0</MinimumValue>
-            <MaximumValue>64</MaximumValue>			
+            <MaximumValue>64</MaximumValue>
         </sip_dscp>
         <rtp_input_dejitter type="BooleanField">
             <default>0</default>
@@ -88,19 +88,19 @@
             <default>600</default>
             <Required>Y</Required>
             <MinimumValue>1</MinimumValue>
-            <MaximumValue>10000</MaximumValue>			
+            <MaximumValue>10000</MaximumValue>
         </tcp_timeout>
         <tcp_connect_timeout type="IntegerField">
             <default>500</default>
             <Required>Y</Required>
             <MinimumValue>1</MinimumValue>
-            <MaximumValue>10000</MaximumValue>			
+            <MaximumValue>10000</MaximumValue>
         </tcp_connect_timeout>
         <tcp_keepalive type="IntegerField">
             <default>20</default>
             <Required>Y</Required>
             <MinimumValue>0</MinimumValue>
-            <MaximumValue>10000</MaximumValue>			
+            <MaximumValue>10000</MaximumValue>
         </tcp_keepalive>
         <ua_string type="TextField">
             <default></default>
@@ -111,10 +111,10 @@
             <multiple>N</multiple>
             <Required>Y</Required>
                 <OptionValues>
-                    <Option1 value="0">0 - do not add ;rport to via header</Option1>
-                    <Option2 value="1">1 - do add ;rport to INCOMING via header only</Option2>
-                    <Option3 value="2">2 - do add ;rport to OUTGOING via header only</Option3>
-                    <Option4 value="3">3 - do add ;rport to OUTGOING and INCOMING via headers</Option4>
+                    <Option1 value="0">Do not add ;rport to via header (0)</Option1>
+                    <Option2 value="1">Add ;rport to INCOMING via header (1)</Option2>
+                    <Option3 value="2">Add ;rport to OUTGOING via header (2)</Option3>
+                    <Option4 value="3">Add ;rport to OUTGOING and INCOMING via headers (3)</Option4>
                 </OptionValues>
         </use_rport>
         <plugin_defaulttarget_enable type="BooleanField">
diff --git a/net/siproxd/src/opnsense/mvc/app/views/OPNsense/Siproxd/general.volt b/net/siproxd/src/opnsense/mvc/app/views/OPNsense/Siproxd/general.volt
index 08b2354c2..cae180f64 100644
--- a/net/siproxd/src/opnsense/mvc/app/views/OPNsense/Siproxd/general.volt
+++ b/net/siproxd/src/opnsense/mvc/app/views/OPNsense/Siproxd/general.volt
@@ -30,10 +30,10 @@ POSSIBILITY OF SUCH DAMAGE.
 <ul class="nav nav-tabs" data-tabs="tabs" id="maintabs">
     <li class="active"><a data-toggle="tab" href="#general">{{ lang._('General') }}</a></li>
     <li><a data-toggle="tab" href="#users">{{ lang._('Users') }}</a></li>
-    <li><a data-toggle="tab" href="#domains">{{ lang._('Outbound Domains') }}</a></li>    
+    <li><a data-toggle="tab" href="#domains">{{ lang._('Outbound Domains') }}</a></li>
     <li><a data-toggle="tab" href="#showregistrations">{{ lang._('Current registrations') }}</a></li>
 </ul>
-    
+
 <div class="tab-content content-box tab-content">
     <div id="general" class="tab-pane fade in active">
         <div class="content-box" style="padding-bottom: 1.5em;">
@@ -86,7 +86,7 @@ POSSIBILITY OF SUCH DAMAGE.
                 </tr>
             </tfoot>
         </table>
-    </div>    
+    </div>
     <div id="showregistrations" class="tab-pane fade in">
       <pre id="showregistrations-cmd"></pre>
     </div>
@@ -106,7 +106,7 @@ $( document ).ready(function() {
     ajaxCall(url="/api/siproxd/service/showregistrations", sendData={}, callback=function(data,status) {
         $("#showregistrations-cmd").text(data['response']);
     });
-                
+
     ajaxCall(url="/api/siproxd/service/status", sendData={}, callback=function(data,status) {
         updateServiceStatusUI(data['status']);
     });
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 11e6ca6a6..0e8ce56d0 100644
--- a/net/siproxd/src/opnsense/service/templates/OPNsense/Siproxd/siproxd.conf
+++ b/net/siproxd/src/opnsense/service/templates/OPNsense/Siproxd/siproxd.conf
@@ -83,7 +83,7 @@ use_rport = {{ OPNsense.siproxd.general.use_rport }}
 {%   for domain_list in helpers.toList('OPNsense.siproxd.domain.domains.domain') %}
 {%     if domain_list.enabled == '1' %}
 outbound_domain_name = {{ domain_list.name }}
-outbound_domain_host = {{ domain_list.host }} 
+outbound_domain_host = {{ domain_list.host }}
 outbound_domain_port = {{ domain_list.port }}
 
 {%     endif %}