diff --git a/front/deviceDetails.php b/front/deviceDetails.php
index e260e4a7..a28da225 100644
--- a/front/deviceDetails.php
+++ b/front/deviceDetails.php
@@ -1033,7 +1033,7 @@ function getDeviceData (readAllData=false) {
       }
 
       // Status
-      $('#deviceStatus').html (deviceData['dev_Status']);
+      $('#deviceStatus').html (deviceData['dev_Status'].replace('-', ''));
       switch (deviceData['dev_Status']) {
         case 'On-line':   icon='fa fa-check';    color='text-green';   break;
         case 'Off-line':  icon='fa fa-close';    color='text-gray';    break;
@@ -1078,7 +1078,7 @@ function getDeviceData (readAllData=false) {
         $('#txtFirstConnection').val                 (deviceData['dev_FirstConnection']);
         $('#txtLastConnection').val                  (deviceData['dev_LastConnection']);
         $('#txtLastIP').val                          (deviceData['dev_LastIP']);
-        $('#txtStatus').val                          (deviceData['dev_Status']);
+        $('#txtStatus').val                          (deviceData['dev_Status'].replace('-', ''));
         if (deviceData['dev_StaticIP'] == 1)         {$('#chkStaticIP').iCheck('check');}    else {$('#chkStaticIP').iCheck('uncheck');}
     
         $('#txtScanCycle').val                       (deviceData['dev_ScanCycle'] +' min');
diff --git a/front/devices.php b/front/devices.php
index c784b3a9..664061dc 100644
--- a/front/devices.php
+++ b/front/devices.php
@@ -263,7 +263,7 @@ function initializeDatatable () {
             default:          color='aqua';             break;
           };
       
-          $(td).html ('<a href="deviceDetails.php?mac='+ rowData[10] +'" class="badge bg-'+ color +'">'+ cellData +'</a>');
+          $(td).html ('<a href="deviceDetails.php?mac='+ rowData[10] +'" class="badge bg-'+ color +'">'+ cellData.replace('-', '') +'</a>');
       } },
     ],