diff --git a/src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/forms/dialogCSO.xml b/src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/forms/dialogCSO.xml
index c1384c773..c99764095 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/forms/dialogCSO.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/forms/dialogCSO.xml
@@ -135,27 +135,4 @@
         <advanced>true</advanced>
         <help>Set primary WINS server address (NetBIOS over TCP/IP Name Server). Repeat this option to set secondary WINS server addresses.</help>
     </field>
-    <field>
-        <type>header</type>
-        <label>Advanced Settings</label>
-        <collapse>true</collapse>
-    </field>
-    <field>
-        <id>cso.tun_mtu</id>
-        <label>TUN device MTU</label>
-        <type>text</type>
-        <help>Take the TUN device MTU to be tun-mtu and derive the link MTU from it.</help>
-    </field>
-    <field>
-        <id>cso.fragment</id>
-        <label>Fragment size</label>
-        <type>text</type>
-        <help>Enable internal datagram fragmentation so that no UDP datagrams are sent which are larger than the specified byte size.</help>
-    </field>
-    <field>
-        <id>cso.mssfix</id>
-        <label>MSS fix</label>
-        <type>checkbox</type>
-        <help>Announce to TCP sessions running over the tunnel that they should limit their send packet sizes such that after OpenVPN has encapsulated them, the resulting UDP packet size that OpenVPN sends to its peer will not exceed the recommended size.</help>
-    </field>
 </fields>
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/forms/dialogInstance.xml b/src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/forms/dialogInstance.xml
index 0215d4c93..ca797e4de 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/forms/dialogInstance.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/forms/dialogInstance.xml
@@ -362,4 +362,25 @@ Set to 0 to disable, remember to change your client as well.
             Set primary NTP server address (Network Time Protocol). Repeat this option to set secondary NTP server addresses.
         </help>
     </field>
+    <field>
+        <id>instane.tun_mtu</id>
+        <label>TUN device MTU</label>
+        <type>text</type>
+        <advanced>true</advanced>
+        <help>Take the TUN device MTU to be tun-mtu and derive the link MTU from it.</help>
+    </field>
+    <field>
+        <id>instane.fragment</id>
+        <label>Fragment size</label>
+        <type>text</type>
+        <advanced>true</advanced>
+        <help>Enable internal datagram fragmentation so that no UDP datagrams are sent which are larger than the specified byte size.</help>
+    </field>
+    <field>
+        <id>instance.mssfix</id>
+        <label>MSS fix</label>
+        <type>checkbox</type>
+        <advanced>true</advanced>
+        <help>Announce to TCP sessions running over the tunnel that they should limit their send packet sizes such that after OpenVPN has encapsulated them, the resulting UDP packet size that OpenVPN sends to its peer will not exceed the recommended size.</help>
+    </field>
 </fields>
diff --git a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php
index b211fa517..e7ac69840 100644
--- a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php
+++ b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php
@@ -143,9 +143,6 @@ class OpenVPN extends BaseModel
                 'description',
                 'dns_domain',
                 'dns_domain_search',
-                'fragment',
-                'mssfix',
-                'tun_mtu',
                 'tunnel_network',
                 'tunnel_networkv6',
             ];
diff --git a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.xml b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.xml
index 55daa7986..e0706f07f 100644
--- a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.xml
@@ -91,19 +91,6 @@
                 <description type="TextField">
                     <Required>N</Required>
                 </description>
-                <tun_mtu type="IntegerField">
-                    <Required>N</Required>
-                    <MinimumValue>60</MinimumValue>
-                    <MaximumValue>65535</MaximumValue>
-                </tun_mtu>
-                <fragment type="IntegerField">
-                    <Required>N</Required>
-                    <MinimumValue>0</MinimumValue>
-                    <MaximumValue>65528</MaximumValue>
-                </fragment>
-                <mssfix type="BooleanField">
-                    <Required>N</Required>
-                </mssfix>
             </Overwrite>
         </Overwrites>
         <Instances>
@@ -381,6 +368,19 @@
                     <FieldSeparator>,</FieldSeparator>
                     <asList>Y</asList>
                 </ntp_servers>
+                <tun_mtu type="IntegerField">
+                    <Required>N</Required>
+                    <MinimumValue>60</MinimumValue>
+                    <MaximumValue>65535</MaximumValue>
+                </tun_mtu>
+                <fragment type="IntegerField">
+                    <Required>N</Required>
+                    <MinimumValue>0</MinimumValue>
+                    <MaximumValue>65528</MaximumValue>
+                </fragment>
+                <mssfix type="BooleanField">
+                    <Required>N</Required>
+                </mssfix>
                 <carp_depend_on type="VirtualIPField">
                     <type>carp</type>
                     <Required>N</Required>
diff --git a/src/opnsense/scripts/openvpn/ovpn_service_control.php b/src/opnsense/scripts/openvpn/ovpn_service_control.php
index 612fafe27..42c7f9c7b 100755
--- a/src/opnsense/scripts/openvpn/ovpn_service_control.php
+++ b/src/opnsense/scripts/openvpn/ovpn_service_control.php
@@ -112,7 +112,6 @@ function get_vhid_status()
     return $vhids;
 }
 
-
 $opts = getopt('ah', [], $optind);
 $args = array_slice($argv, $optind);
 
@@ -130,8 +129,10 @@ if (isset($opts['h']) || empty($args) || !in_array($args[0], ['start', 'stop', '
     if ($action != 'stop') {
         $mdl->generateInstanceConfig($instance_id);
     }
+
     $vhids = $action == 'configure' ? get_vhid_status() : [];
     $instance_ids = [];
+
     foreach ($mdl->Instances->Instance->iterateItems() as $key => $node) {
         if (empty((string)$node->enabled)) {
             continue;
@@ -177,6 +178,7 @@ if (isset($opts['h']) || empty($args) || !in_array($args[0], ['start', 'stop', '
         }
         fclose($statHandle);
     }
+
     /**
      * When -a is specified, cleaup up old or disabled instances
      */
@@ -208,5 +210,6 @@ if (isset($opts['h']) || empty($args) || !in_array($args[0], ['start', 'stop', '
             }
         }
     }
+
     closelog();
 }