diff --git a/net/freeradius/pkg-descr b/net/freeradius/pkg-descr
index 9f645c32a..8810940d8 100644
--- a/net/freeradius/pkg-descr
+++ b/net/freeradius/pkg-descr
@@ -19,6 +19,7 @@ Plugin Changelog
 
 * Add DHCP support, serving only for DHCP relays
 * Allow usage of remote MySQL server
+* Rework service status UI
 
 
 WWW: https://www.freeradius.org
diff --git a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/client.volt b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/client.volt
index bf68a69b6..aa0640bc3 100644
--- a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/client.volt
+++ b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/client.volt
@@ -30,6 +30,8 @@ POSSIBILITY OF SUCH DAMAGE.
 <script>
 
     $( document ).ready(function() {
+    updateServiceControlUI('freeradius');
+    
         /*************************************************************************************************************
          * link grid actions
          *************************************************************************************************************/
@@ -56,7 +58,7 @@ POSSIBILITY OF SUCH DAMAGE.
             ajaxCall(url="/api/freeradius/service/reconfigure", sendData={}, callback=function(data,status) {
                 // when done, disable progress animation.
                 $("#reconfigureAct_progress").removeClass("fa fa-spinner fa-pulse");
-
+                updateServiceControlUI('freeradius');
                 if (status != "success" || data['status'] != 'ok') {
                     BootstrapDialog.show({
                         type: BootstrapDialog.TYPE_WARNING,
diff --git a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/dhcp.volt b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/dhcp.volt
index 8bc04fd4c..66a935563 100644
--- a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/dhcp.volt
+++ b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/dhcp.volt
@@ -30,6 +30,8 @@ POSSIBILITY OF SUCH DAMAGE.
 <script>
 
     $( document ).ready(function() {
+        updateServiceControlUI('freeradius');
+
         /*************************************************************************************************************
          * link grid actions
          *************************************************************************************************************/
@@ -56,7 +58,7 @@ POSSIBILITY OF SUCH DAMAGE.
             ajaxCall(url="/api/freeradius/service/reconfigure", sendData={}, callback=function(data,status) {
                 // when done, disable progress animation.
                 $("#reconfigureAct_progress").removeClass("fa fa-spinner fa-pulse");
-
+                updateServiceControlUI('freeradius');
                 if (status != "success" || data['status'] != 'ok') {
                     BootstrapDialog.show({
                         type: BootstrapDialog.TYPE_WARNING,
diff --git a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/eap.volt b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/eap.volt
index 139b104c1..8f57e0a82 100644
--- a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/eap.volt
+++ b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/eap.volt
@@ -42,18 +42,14 @@ POSSIBILITY OF SUCH DAMAGE.
             formatTokenizersUI();
             $('.selectpicker').selectpicker('refresh');
         });
-        ajaxCall(url="/api/freeradius/service/status", sendData={}, callback=function (data, status) {
-            updateServiceStatusUI(data['status']);
-        });
-
+        updateServiceControlUI('freeradius');
+        
         // link save button to API set action
         $("#saveAct").click(function () {
             saveFormToEndpoint(url="/api/freeradius/eap/set", formid='frm_eap_settings',callback_ok=function () {
             $("#saveAct_progress").addClass("fa fa-spinner fa-pulse");
                 ajaxCall(url="/api/freeradius/service/reconfigure", sendData={}, callback=function (data,status) {
-                    ajaxCall(url="/api/freeradius/service/status", sendData={}, callback=function (data,status) {
-                        updateServiceStatusUI(data['status']);
-                    });
+                    updateServiceControlUI('freeradius');
                     $("#saveAct_progress").removeClass("fa fa-spinner fa-pulse");
                 });
             });
diff --git a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/general.volt b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/general.volt
index 78ae5d18d..d87dedf7e 100644
--- a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/general.volt
+++ b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/general.volt
@@ -42,18 +42,14 @@ POSSIBILITY OF SUCH DAMAGE.
             formatTokenizersUI();
             $('.selectpicker').selectpicker('refresh');
         });
-        ajaxCall(url="/api/freeradius/service/status", sendData={}, callback=function (data, status) {
-            updateServiceStatusUI(data['status']);
-        });
+        updateServiceControlUI('freeradius');
 
         // link save button to API set action
         $("#saveAct").click(function () {
             saveFormToEndpoint(url="/api/freeradius/general/set", formid='frm_general_settings',callback_ok=function () {
             $("#saveAct_progress").addClass("fa fa-spinner fa-pulse");
                 ajaxCall(url="/api/freeradius/service/reconfigure", sendData={}, callback=function (data,status) {
-                    ajaxCall(url="/api/freeradius/service/status", sendData={}, callback=function (data,status) {
-                        updateServiceStatusUI(data['status']);
-                    });
+                    updateServiceControlUI('freeradius');
                     $("#saveAct_progress").removeClass("fa fa-spinner fa-pulse");
                 });
             });
diff --git a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/ldap.volt b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/ldap.volt
index 7a85ee222..04719a032 100644
--- a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/ldap.volt
+++ b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/ldap.volt
@@ -42,18 +42,14 @@ POSSIBILITY OF SUCH DAMAGE.
             formatTokenizersUI();
             $('.selectpicker').selectpicker('refresh');
         });
-        ajaxCall(url="/api/freeradius/service/status", sendData={}, callback=function (data, status) {
-            updateServiceStatusUI(data['status']);
-        });
+        updateServiceControlUI('freeradius');
 
         // link save button to API set action
         $("#saveAct").click(function () {
             saveFormToEndpoint(url="/api/freeradius/ldap/set", formid='frm_ldap_settings',callback_ok=function () {
             $("#saveAct_progress").addClass("fa fa-spinner fa-pulse");
                 ajaxCall(url="/api/freeradius/service/reconfigure", sendData={}, callback=function (data,status) {
-                    ajaxCall(url="/api/freeradius/service/status", sendData={}, callback=function (data,status) {
-                        updateServiceStatusUI(data['status']);
-                    });
+                    updateServiceControlUI('freeradius');
                     $("#saveAct_progress").removeClass("fa fa-spinner fa-pulse");
                 });
             });
diff --git a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/lease.volt b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/lease.volt
index de3d5ad20..2499fc12d 100644
--- a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/lease.volt
+++ b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/lease.volt
@@ -30,6 +30,8 @@ POSSIBILITY OF SUCH DAMAGE.
 <script>
 
     $( document ).ready(function() {
+        updateServiceControlUI('freeradius');
+
         /*************************************************************************************************************
          * link grid actions
          *************************************************************************************************************/
@@ -56,7 +58,7 @@ POSSIBILITY OF SUCH DAMAGE.
             ajaxCall(url="/api/freeradius/service/reconfigure", sendData={}, callback=function(data,status) {
                 // when done, disable progress animation.
                 $("#reconfigureAct_progress").removeClass("fa fa-spinner fa-pulse");
-
+                updateServiceControlUI('freeradius');
                 if (status != "success" || data['status'] != 'ok') {
                     BootstrapDialog.show({
                         type: BootstrapDialog.TYPE_WARNING,
diff --git a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/user.volt b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/user.volt
index b0ca06555..932a635b2 100644
--- a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/user.volt
+++ b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/user.volt
@@ -30,6 +30,8 @@ POSSIBILITY OF SUCH DAMAGE.
 <script>
 
     $( document ).ready(function() {
+        updateServiceControlUI('freeradius');
+
         /*************************************************************************************************************
          * link grid actions
          *************************************************************************************************************/
@@ -56,7 +58,7 @@ POSSIBILITY OF SUCH DAMAGE.
             ajaxCall(url="/api/freeradius/service/reconfigure", sendData={}, callback=function(data,status) {
                 // when done, disable progress animation.
                 $("#reconfigureAct_progress").removeClass("fa fa-spinner fa-pulse");
-
+                updateServiceControlUI('freeradius');
                 if (status != "success" || data['status'] != 'ok') {
                     BootstrapDialog.show({
                         type: BootstrapDialog.TYPE_WARNING,