diff --git a/net/radsecproxy/src/opnsense/mvc/app/models/OPNsense/RadSecProxy/Menu/Menu.xml b/net/radsecproxy/src/opnsense/mvc/app/models/OPNsense/RadSecProxy/Menu/Menu.xml
index 707b620ca..274409397 100644
--- a/net/radsecproxy/src/opnsense/mvc/app/models/OPNsense/RadSecProxy/Menu/Menu.xml
+++ b/net/radsecproxy/src/opnsense/mvc/app/models/OPNsense/RadSecProxy/Menu/Menu.xml
@@ -1,13 +1,13 @@
 <menu>
     <Services>
         <RadSecProxy VisibleName="RadSecProxy" cssClass="fa fa-shield fa-fw">
-            <Basic VisibleName="General" order="10" url="/ui/radsecproxy/general" />
-            <Clients VisibleName="Clients" order="20" url="/ui/radsecproxy/clients" />
-            <Servers VisibleName="Servers" order="30" url="/ui/radsecproxy/servers" />
-            <Realms VisibleName="Realms" order="40" url="/ui/radsecproxy/realms" />
-            <Tls VisibleName="TLS" order="50" url="/ui/radsecproxy/tls" />
-            <Rewrites VisibleName="Rewrite-Rules" order="60" url="/ui/radsecproxy/rewrites" />
-             <Log  order="100" VisibleName="Log File" url="/ui/diagnostics/log/core/radsecproxy" />
+            <General order="10" url="/ui/radsecproxy/general"/>
+            <Clients order="20" url="/ui/radsecproxy/clients"/>
+            <Servers order="30" url="/ui/radsecproxy/servers"/>
+            <Realms order="40" url="/ui/radsecproxy/realms"/>
+            <TLS order="50" url="/ui/radsecproxy/tls"/>
+            <Rewrites order="60" VisibleName="Rewrite-Rules" url="/ui/radsecproxy/rewrites"/>
+            <Log order="100" VisibleName="Log File" url="/ui/diagnostics/log/core/radsecproxy"/>
         </RadSecProxy>
     </Services>
 </menu>
diff --git a/net/radsecproxy/src/opnsense/service/conf/actions.d/actions_radsecproxy.conf b/net/radsecproxy/src/opnsense/service/conf/actions.d/actions_radsecproxy.conf
index 6f7d0908f..0d60ddcf7 100644
--- a/net/radsecproxy/src/opnsense/service/conf/actions.d/actions_radsecproxy.conf
+++ b/net/radsecproxy/src/opnsense/service/conf/actions.d/actions_radsecproxy.conf
@@ -5,25 +5,25 @@ type:script
 message:starting radsecproxy
 
 [stop]
-command:/usr/local/etc/rc.d/radsecproxy stop;
+command:/usr/local/etc/rc.d/radsecproxy stop
 parameters:
 type:script
 message:stopping radsecproxy
 
 [restart]
-command:/usr/local/etc/rc.d/radsecproxy restart;
+command:/usr/local/etc/rc.d/radsecproxy restart
 parameters:
 type:script
 message:restarting radsecproxy
 
 [reload]
-command:/usr/local/etc/rc.d/radsecproxy restart;
+command:/usr/local/etc/rc.d/radsecproxy restart
 parameters:
 type:script
 message:reloading radsecproxy
 
 [status]
-command:/usr/local/etc/rc.d/radsecproxy status;exit 0;
+command:/usr/local/etc/rc.d/radsecproxy status; exit 0
 parameters:
 type:script_output
 message:radsecproxy status
diff --git a/net/radsecproxy/src/opnsense/service/templates/OPNsense/RadSecProxy/rc.conf.d b/net/radsecproxy/src/opnsense/service/templates/OPNsense/RadSecProxy/rc.conf.d
index aa0daa928..7f32bf52a 100644
--- a/net/radsecproxy/src/opnsense/service/templates/OPNsense/RadSecProxy/rc.conf.d
+++ b/net/radsecproxy/src/opnsense/service/templates/OPNsense/RadSecProxy/rc.conf.d
@@ -1,8 +1,8 @@
 {% if not helpers.empty('OPNsense.radsecproxy.general.enabled') %}
 radsecproxy_enable="YES"
-{% else %}
-radsecproxy_enable="NO"
-{% endif %}
 radsecproxy_user="root"
 radsecproxy_group="wheel"
 radsecproxy_setup="/usr/local/opnsense/scripts/OPNsense/RadSecProxy/setup.sh"
+{% else %}
+radsecproxy_enable="NO"
+{% endif %}