diff --git a/www/c-icap/src/opnsense/mvc/app/models/OPNsense/CICAP/Antivirus.xml b/www/c-icap/src/opnsense/mvc/app/models/OPNsense/CICAP/Antivirus.xml
index d31805eb8..cd45fe479 100644
--- a/www/c-icap/src/opnsense/mvc/app/models/OPNsense/CICAP/Antivirus.xml
+++ b/www/c-icap/src/opnsense/mvc/app/models/OPNsense/CICAP/Antivirus.xml
@@ -11,15 +11,15 @@
             <Default>TEXT,DATA,EXECUTABLE,ARCHIVE,GIF,JPEG,MSOFFICE</Default>
             <Multiple>Y</Multiple>
             <Required>Y</Required>
-                <OptionValues>
-                    <TEXT>Text files</TEXT>
-                    <DATA>Binary files</DATA>
-                    <EXECUTABLE>Executables</EXECUTABLE>
-                    <ARCHIVE>Archives</ARCHIVE>
-                    <GIF>GIF animations</GIF>
-                    <JPEG>JPEG pictures</JPEG>
-                    <MSOFFICE>Microsoft office files</MSOFFICE>
-                </OptionValues>
+            <OptionValues>
+                <TEXT>Text files</TEXT>
+                <DATA>Binary files</DATA>
+                <EXECUTABLE>Executables</EXECUTABLE>
+                <ARCHIVE>Archives</ARCHIVE>
+                <GIF>GIF animations</GIF>
+                <JPEG>JPEG pictures</JPEG>
+                <MSOFFICE>Microsoft office files</MSOFFICE>
+            </OptionValues>
         </scanfiletypes>
         <sendpercentdata type="IntegerField">
             <Default>5</Default>
@@ -41,5 +41,5 @@
             <Default>5M</Default>
             <Required>Y</Required>
         </maxobjectsize>
-	</items>
+    </items>
 </model>
diff --git a/www/c-icap/src/opnsense/mvc/app/models/OPNsense/CICAP/General.xml b/www/c-icap/src/opnsense/mvc/app/models/OPNsense/CICAP/General.xml
index 8f1d7232a..ba65b5243 100644
--- a/www/c-icap/src/opnsense/mvc/app/models/OPNsense/CICAP/General.xml
+++ b/www/c-icap/src/opnsense/mvc/app/models/OPNsense/CICAP/General.xml
@@ -33,31 +33,25 @@
         </minsparethreads>
         <maxsparethreads type="IntegerField">
             <Default>20</Default>
-	    <Required>Y</Required>
-	</maxsparethreads>
+            <Required>Y</Required>
+        </maxsparethreads>
         <threadsperchild type="IntegerField">
             <Default>10</Default>
-	    <Required>Y</Required>
-	</threadsperchild>
+            <Required>Y</Required>
+        </threadsperchild>
         <maxrequestsperchild type="IntegerField">
             <Default>0</Default>
-	    <Required>Y</Required>
-	</maxrequestsperchild>
+            <Required>Y</Required>
+        </maxrequestsperchild>
         <listenaddress type="NetworkField">
             <Default>::1</Default>
-	    <WildcardEnabled>N</WildcardEnabled>
-	    <NetMaskRequired>N</NetMaskRequired>
-	    <FieldSeparator>,</FieldSeparator>
+            <WildcardEnabled>N</WildcardEnabled>
+            <NetMaskRequired>N</NetMaskRequired>
+            <FieldSeparator>,</FieldSeparator>
             <Required>Y</Required>
         </listenaddress>
-        <serveradmin type="TextField">
-            <Default></Default>
-            <Required>N</Required>
-        </serveradmin>
-        <servername type="TextField">
-            <Default></Default>
-            <Required>N</Required>
-        </servername>
+        <serveradmin type="TextField"/>
+        <servername type="TextField"/>
         <enable_accesslog type="BooleanField">
             <Default>1</Default>
             <Required>Y</Required>