diff --git a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Client.xml b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Client.xml
index e72aadcf6..0fa4d9c52 100644
--- a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Client.xml
+++ b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Client.xml
@@ -4,23 +4,20 @@
     <version>1.0.0</version>
     <items>
         <clients>
-                <client type="ArrayField">
-                        <enabled type="BooleanField">
-                                <default>1</default>
-                                <Required>Y</Required>
-                        </enabled>
-                        <name type="TextField">
-                                <default></default>
-                                <Required>Y</Required>
-                        </name>
-                        <secret type="TextField">
-                                <default></default>
-                                <Required>Y</Required>
-                        </secret>
-                        <ip type="TextField">
-                                <default></default>
-                                <Required>N</Required>
-                        </ip>
+            <client type="ArrayField">
+                <enabled type="BooleanField">
+                    <default>1</default>
+                    <Required>Y</Required>
+                </enabled>
+                <name type="TextField">
+                    <Required>Y</Required>
+                </name>
+                <secret type="TextField">
+                    <Required>Y</Required>
+                </secret>
+                <ip type="TextField">
+                    <Required>N</Required>
+                </ip>
             </client>
         </clients>
     </items>
diff --git a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Eap.xml b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Eap.xml
index a65a3b144..005d63707 100644
--- a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Eap.xml
+++ b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Eap.xml
@@ -19,17 +19,14 @@
             <Required>Y</Required>
         </enable_client_cert>
         <ca type="CertificateField">
-            <default></default>
             <Type>ca</Type>
             <Required>N</Required>
         </ca>
         <certificate type="CertificateField">
-            <default></default>
             <Type>cert</Type>
             <Required>N</Required>
         </certificate>
         <crl type="CertificateField">
-            <default></default>
             <Type>crl</Type>
             <Required>N</Required>
         </crl>
diff --git a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/General.xml b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/General.xml
index 1d9018989..c210db4b6 100644
--- a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/General.xml
+++ b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/General.xml
@@ -29,7 +29,7 @@
             <OptionValues>
                 <files>files</files>
                 <syslog>syslog</syslog>
-            </OptionValues>    
+            </OptionValues>
         </log_destination>
         <log_authentication_request type="BooleanField">
             <default>0</default>
diff --git a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/User.xml b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/User.xml
index 8ff64fe6f..cc803cbb1 100644
--- a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/User.xml
+++ b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/User.xml
@@ -4,69 +4,56 @@
     <version>1.0.0</version>
     <items>
         <users>
-                <user type="ArrayField">
-                        <enabled type="BooleanField">
-                                <default>1</default>
-                                <Required>Y</Required>
-                        </enabled>
-                        <username type="TextField">
-                                <default></default>
-                                <Required>Y</Required>
-                                <mask>/^([0-9a-zA-Z._\-]){1,128}$/u</mask>
-                        </username>
-                        <password type="TextField">
-                                <default></default>
-                                <Required>Y</Required>
-                                <mask>/^([0-9a-zA-Z._\-\!\$\%\/\(\)\+\#\=]){1,128}$/u</mask>
-                        </password>
-                        <description type="TextField">
-                                <default></default>
-                                <Required>N</Required>
-                        </description>
-                        <ip type="TextField">
-                                <default></default>
-                                <Required>N</Required>
-                                <mask>/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/</mask>
-                        </ip>
-                        <subnet type="TextField">
-                                <default></default>
-                                <Required>N</Required>
-                                <mask>/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/</mask>
-                        </subnet>
-                        <vlan type="IntegerField">
-                                <default></default>
-                                <Required>N</Required>
-                                <MinimumValue>1</MinimumValue>
-                                <MaximumValue>4096</MaximumValue>
-                        </vlan>
-                        <wispr_bw_min_up type="IntegerField">
-                                <default></default>
-                                <Required>N</Required>
-                        </wispr_bw_min_up>
-                        <wispr_bw_max_up type="IntegerField">
-                                <default></default>
-                                <Required>N</Required>
-                        </wispr_bw_max_up>
-                        <wispr_bw_min_down type="IntegerField">
-                                <default></default>
-                                <Required>N</Required>
-                        </wispr_bw_min_down>
-                        <wispr_bw_max_down type="IntegerField">
-                                <default></default>
-                                <Required>N</Required>
-                        </wispr_bw_max_down>
-                        <chillispot_bw_max_up type="IntegerField">
-                                <default></default>
-                                <Required>N</Required>
-                        </chillispot_bw_max_up>
-                        <chillispot_bw_max_down type="IntegerField">
-                                <default></default>
-                                <Required>N</Required>
-                        </chillispot_bw_max_down>
-                        <sessionlimit_max_session_limit type="IntegerField">
-                                <default></default>
-                                <Required>N</Required>
-                        </sessionlimit_max_session_limit>
+            <user type="ArrayField">
+                <enabled type="BooleanField">
+                    <default>1</default>
+                    <Required>Y</Required>
+                </enabled>
+                <username type="TextField">
+                    <Required>Y</Required>
+                    <mask>/^([0-9a-zA-Z._\-]){1,128}$/u</mask>
+                </username>
+                <password type="TextField">
+                    <Required>Y</Required>
+                    <mask>/^([0-9a-zA-Z._\-\!\$\%\/\(\)\+\#\=]){1,128}$/u</mask>
+                </password>
+                <description type="TextField">
+                    <Required>N</Required>
+                </description>
+                <ip type="TextField">
+                    <Required>N</Required>
+                    <mask>/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/</mask>
+                </ip>
+                <subnet type="TextField">
+                    <Required>N</Required>
+                    <mask>/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/</mask>
+                </subnet>
+                <vlan type="IntegerField">
+                    <Required>N</Required>
+                    <MinimumValue>1</MinimumValue>
+                    <MaximumValue>4096</MaximumValue>
+                </vlan>
+                <wispr_bw_min_up type="IntegerField">
+                    <Required>N</Required>
+                </wispr_bw_min_up>
+                <wispr_bw_max_up type="IntegerField">
+                    <Required>N</Required>
+                </wispr_bw_max_up>
+                <wispr_bw_min_down type="IntegerField">
+                    <Required>N</Required>
+                </wispr_bw_min_down>
+                <wispr_bw_max_down type="IntegerField">
+                    <Required>N</Required>
+                </wispr_bw_max_down>
+                <chillispot_bw_max_up type="IntegerField">
+                    <Required>N</Required>
+                </chillispot_bw_max_up>
+                <chillispot_bw_max_down type="IntegerField">
+                    <Required>N</Required>
+                </chillispot_bw_max_down>
+                <sessionlimit_max_session_limit type="IntegerField">
+                    <Required>N</Required>
+                </sessionlimit_max_session_limit>
             </user>
         </users>
     </items>
diff --git a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/radiusd.conf b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/radiusd.conf
index 3ff56356a..cc8e27ea3 100644
--- a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/radiusd.conf
+++ b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/radiusd.conf
@@ -42,7 +42,7 @@ log {
 {% else %}
         auth_badpass = no
 {% endif %}
-{% if helpers.exists('OPNsense.freeradius.general.log_authgoodpass') and OPNsense.freeradius.general.log_authgoodpass == '1' %}        
+{% if helpers.exists('OPNsense.freeradius.general.log_authgoodpass') and OPNsense.freeradius.general.log_authgoodpass == '1' %}
         auth_goodpass = yes
 {% else %}
         auth_goodpass = no
@@ -79,7 +79,7 @@ modules {
 }
 
 instantiate {
-{% if helpers.exists('OPNsense.freeradius.general.sessionlimit') and OPNsense.freeradius.general.sessionlimit == '1' %}        
+{% if helpers.exists('OPNsense.freeradius.general.sessionlimit') and OPNsense.freeradius.general.sessionlimit == '1' %}
         daily
 {% endif %}
 }
diff --git a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/sites-enabled-default b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/sites-enabled-default
index 111f8c063..92e968506 100644
--- a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/sites-enabled-default
+++ b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/sites-enabled-default
@@ -27,7 +27,7 @@ listen {
         type = auth
         ipv6addr = ::
         port = 0
-        
+
         limit {
               max_connections = 16
               lifetime = 0
@@ -58,7 +58,7 @@ authorize {
         -sql
         -ldap
 
-{% if helpers.exists('OPNsense.freeradius.general.sessionlimit') and OPNsense.freeradius.general.sessionlimit == '1' %}        
+{% if helpers.exists('OPNsense.freeradius.general.sessionlimit') and OPNsense.freeradius.general.sessionlimit == '1' %}
         daily
 {% endif %}
 
@@ -92,7 +92,7 @@ preacct {
 
 accounting {
         detail
-{% if helpers.exists('OPNsense.freeradius.general.sessionlimit') and OPNsense.freeradius.general.sessionlimit == '1' %}        
+{% if helpers.exists('OPNsense.freeradius.general.sessionlimit') and OPNsense.freeradius.general.sessionlimit == '1' %}
         daily
         sradutmp
 {% endif %}