diff --git a/net-mgmt/net-snmp/src/opnsense/mvc/app/models/OPNsense/Netsnmp/General.xml b/net-mgmt/net-snmp/src/opnsense/mvc/app/models/OPNsense/Netsnmp/General.xml
index c3e0d7e95..19118edce 100644
--- a/net-mgmt/net-snmp/src/opnsense/mvc/app/models/OPNsense/Netsnmp/General.xml
+++ b/net-mgmt/net-snmp/src/opnsense/mvc/app/models/OPNsense/Netsnmp/General.xml
@@ -7,18 +7,9 @@
             <Default>0</Default>
             <Required>Y</Required>
         </enabled>
-        <community type="TextField">
-            <Default></Default>
-            <Required>N</Required>
-        </community>
-        <syslocation type="TextField">
-            <Default></Default>
-            <Required>N</Required>
-        </syslocation>
-        <syscontact type="TextField">
-            <Default></Default>
-            <Required>N</Required>
-        </syscontact>
+        <community type="TextField"/>
+        <syslocation type="TextField"/>
+        <syscontact type="TextField"/>
         <l3visibility type="BooleanField">
             <Default>0</Default>
             <Required>Y</Required>
@@ -36,8 +27,6 @@
             <Required>Y</Required>
         </enableobservium>
         <listen type="NetworkField">
-            <FieldSeparator>,</FieldSeparator>
-            <Required>N</Required>
             <AsList>Y</AsList>
         </listen>
     </items>
diff --git a/net-mgmt/net-snmp/src/opnsense/mvc/app/models/OPNsense/Netsnmp/User.xml b/net-mgmt/net-snmp/src/opnsense/mvc/app/models/OPNsense/Netsnmp/User.xml
index 9a705d532..9b788f584 100644
--- a/net-mgmt/net-snmp/src/opnsense/mvc/app/models/OPNsense/Netsnmp/User.xml
+++ b/net-mgmt/net-snmp/src/opnsense/mvc/app/models/OPNsense/Netsnmp/User.xml
@@ -10,22 +10,19 @@
                     <Required>Y</Required>
                 </enabled>
                 <username type="TextField">
-                    <Default></Default>
                     <Required>Y</Required>
                     <Mask>/^([0-9a-zA-Z._\-]){1,64}$/u</Mask>
-                    <ValidationMessage>Should be a string between 1 and 64 characters. Allowed characters are 0-9a-zA-Z._-</ValidationMessage>
+                    <ValidationMessage>Should be a string between 1 and 64 characters. Allowed characters are 0-9a-zA-Z_-.</ValidationMessage>
                 </username>
                 <password type="TextField">
-                    <Default></Default>
                     <Required>Y</Required>
                     <Mask>/^([0-9a-zA-Z._\-\!\$\%\/\(\)\+\#\=]){8,64}$/u</Mask>
-                    <ValidationMessage>Should be a string between 8 and 64 characters. Allowed characters are 0-9a-zA-Z._-!$%/()+#=</ValidationMessage>
+                    <ValidationMessage>Should be a string between 8 and 64 characters. Allowed characters are 0-9a-zA-Z_-!$%/()+#=.</ValidationMessage>
                 </password>
                 <enckey type="TextField">
-                    <Default></Default>
                     <Required>Y</Required>
                     <Mask>/^([0-9a-zA-Z._\-\!\$\%\/\(\)\+\#\=]){8,64}$/u</Mask>
-                    <ValidationMessage>Should be a string between 8 and 64 characters. Allowed characters are 0-9a-zA-Z._-!$%/()+#=</ValidationMessage>
+                    <ValidationMessage>Should be a string between 8 and 64 characters. Allowed characters are 0-9a-zA-Z_-!$%/()+#=.</ValidationMessage>
                 </enckey>
                 <readwrite type="BooleanField">
                     <Default>0</Default>