diff --git a/net/freeradius/pkg-descr b/net/freeradius/pkg-descr
index 21116160b..cfd09d34c 100644
--- a/net/freeradius/pkg-descr
+++ b/net/freeradius/pkg-descr
@@ -9,18 +9,14 @@ needs of many Fortune-500 companies and Tier 1 ISPs.
 It is also widely used for Enterprise Wi-Fi and IEEE 802.1X network
 security, particularly in the academic community, including eduroam.
 
-The server is fast, feature-rich, modular, and scalable.
-
-WWW: https://www.freeradius.org
-
-
 Plugin Changelog
 ================
 
 1.9.28
 
 * Add Groups for VLAN assignment
-* Add Fallback PPSK
+* Add fallback PPSK (contributed by Tobias Perschon)
+* Add fallback Tunnel-Password field (contributed by Robert Resch)
 
 1.9.27
 
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 48a594e6b..5e04541b4 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
@@ -153,7 +153,7 @@
             <Required>Y</Required>
         </fallbackproxy>
         <fallback_tunnel_password type="TextField">
-            <mask>/^([0-9a-zA-Z._\-\!\$\%\/\(\)\+\#\=\{\}:]){1,128}$/u</mask>
+            <Mask>/^([0-9a-zA-Z._\-\!\$\%\/\(\)\+\#\=\{\}:]){1,128}$/u</Mask>
         </fallback_tunnel_password>
     </items>
 </model>
diff --git a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Ldap.xml b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Ldap.xml
index a6165dd99..67cffa256 100644
--- a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Ldap.xml
+++ b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Ldap.xml
@@ -18,7 +18,7 @@
         <server type="TextField">
             <Required>N</Required>
         </server>
-      <serverport type="TextField">
+        <serverport type="TextField">
             <Required>N</Required>
         </serverport>
         <ldapcert type="CertificateField">
diff --git a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Proxy.xml b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Proxy.xml
index f5b767361..8f25f7292 100644
--- a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Proxy.xml
+++ b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Proxy.xml
@@ -127,7 +127,7 @@
                     <Required>Y</Required>
                 </limit_idletimeout>
             </homeserver>
-         </homeservers>
+        </homeservers>
         <homeserverpools>
             <homeserverpool type="ArrayField">
                 <enabled type="BooleanField">
@@ -159,12 +159,9 @@
                     <ChangeCase>lower</ChangeCase>
                     <ValidationMessage>Please provide valid server addresses, i.e. radius.example.com, 10.0.0.2 or 10.0.0.0/24.</ValidationMessage>
                 </homeservers>
-                <fallback type="TextField">
-                    <Default></Default>
-                    <Required>N</Required>
-                </fallback>
+                <fallback type="TextField"/>
             </homeserverpool>
-         </homeserverpools>
+        </homeserverpools>
         <realms>
             <realm type="ArrayField">
                 <enabled type="BooleanField">
@@ -174,17 +171,9 @@
                 <name type="TextField">
                     <Required>Y</Required>
                 </name>
-                <auth_pool type="TextField">
-                    <Default></Default>
-                    <Required>N</Required>
-                </auth_pool>
-                <acct_pool type="TextField">
-                    <Default></Default>
-                    <Required>N</Required>
-                </acct_pool>
-                <nostrip type="BooleanField">
-                    <Required>N</Required>
-                </nostrip>
+                <auth_pool type="TextField"/>
+                <acct_pool type="TextField"/>
+                <nostrip type="BooleanField"/>
             </realm>
         </realms>
     </items>
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 5b4546b23..b1e2dd237 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
@@ -133,7 +133,7 @@
                     <Required>N</Required>
                 </linkedAVPair>
                 <tunnel_password type="TextField">
-                    <mask>/^([0-9a-zA-Z._\-\!\$\%\/\(\)\+\#\=\{\}:]){1,128}$/u</mask>
+                    <Mask>/^([0-9a-zA-Z._\-\!\$\%\/\(\)\+\#\=\{\}:]){1,128}$/u</Mask>
                 </tunnel_password>
             </user>
         </users>