diff --git a/glances/outputs/static/js/components/plugin-cpu/controller.js b/glances/outputs/static/js/components/plugin-cpu/controller.js
index 44090d2a..7a6e0bbf 100644
--- a/glances/outputs/static/js/components/plugin-cpu/controller.js
+++ b/glances/outputs/static/js/components/plugin-cpu/controller.js
@@ -28,6 +28,8 @@ export default function GlancesPluginCpuController($scope, GlancesStats) {
         var stats = data.stats['cpu'];
         _view = data.views['cpu'];
 
+        vm.isLinux = data.isLinux;
+
         vm.total = stats.total;
         vm.user = stats.user;
         vm.system = stats.system;
diff --git a/glances/outputs/static/js/components/plugin-cpu/view.html b/glances/outputs/static/js/components/plugin-cpu/view.html
index ac6fd4d8..265adc7e 100644
--- a/glances/outputs/static/js/components/plugin-cpu/view.html
+++ b/glances/outputs/static/js/components/plugin-cpu/view.html
@@ -72,7 +72,7 @@
                         {{ vm.soft_interrupts }}
                     </div>
                 </div>
-                <div class="table-row" ng-if="!statsSystem.isLinux() && vm.syscalls">
+                <div class="table-row" ng-if="!vm.isLinux && vm.syscalls">
                     <div class="table-cell text-left">syscal:</div>
                     <div class="table-cell">
                         {{ vm.syscalls }}
diff --git a/glances/outputs/static/js/components/plugin-system/controller.js b/glances/outputs/static/js/components/plugin-system/controller.js
index 72bd6d5d..a271cabd 100644
--- a/glances/outputs/static/js/components/plugin-system/controller.js
+++ b/glances/outputs/static/js/components/plugin-system/controller.js
@@ -25,6 +25,7 @@ export default function GlancesPluginSystemController($scope, GlancesStats) {
     var loadData = function (data) {
         var stats = data.stats['system'];
 
+        vm.isLinux = data.isLinux;
         vm.hostname = stats['hostname'];
         vm.platform = stats['platform'];
         vm.os.name = stats['os_name'];
diff --git a/glances/outputs/static/js/components/plugin-system/view.html b/glances/outputs/static/js/components/plugin-system/view.html
index 2e1e0824..4ef9586c 100644
--- a/glances/outputs/static/js/components/plugin-system/view.html
+++ b/glances/outputs/static/js/components/plugin-system/view.html
@@ -1,7 +1,6 @@
 <section id="system">
     <span ng-if="vm.isDisconnected" class="critical">Disconnected from</span>
     <span class="title">{{ vm.hostname }}</span>
-    <span ng-if="vm.stats.isLinux" class="hidden-xs hidden-sm">({{ vm.humanReadableName }} / {{ vm.os.name }} {{ vm.os.version }})</span>
-    <span ng-if="!vm.stats.isLinux"
-          class="hidden-xs hidden-sm">({{ vm.os.name }} {{ vm.os.version }} {{ vm.platform }})</span>
+    <span ng-if="vm.isLinux" class="hidden-xs hidden-sm">({{ vm.humanReadableName }} / {{ vm.os.name }} {{ vm.os.version }})</span>
+    <span ng-if="!vm.isLinux" class="hidden-xs hidden-sm">({{ vm.os.name }} {{ vm.os.version }} {{ vm.platform }})</span>
 </section>
diff --git a/glances/outputs/static/package-lock.json b/glances/outputs/static/package-lock.json
index ec89b6f1..4445a4e1 100644
--- a/glances/outputs/static/package-lock.json
+++ b/glances/outputs/static/package-lock.json
@@ -2003,7 +2003,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -2024,12 +2025,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -2044,17 +2047,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -2171,7 +2177,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -2183,6 +2190,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -2197,6 +2205,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -2204,12 +2213,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -2228,6 +2239,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -2308,7 +2320,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -2320,6 +2333,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -2405,7 +2419,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -2441,6 +2456,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -2460,6 +2476,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -2503,12 +2520,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
diff --git a/glances/outputs/static/public/glances.js b/glances/outputs/static/public/glances.js
index 0cebb34c..13d63ce7 100644
Binary files a/glances/outputs/static/public/glances.js and b/glances/outputs/static/public/glances.js differ
diff --git a/glances/outputs/static/public/glances.map.js b/glances/outputs/static/public/glances.map.js
index 5a192e31..eafa6195 100644
Binary files a/glances/outputs/static/public/glances.map.js and b/glances/outputs/static/public/glances.map.js differ