diff --git a/js/src/server/status/monitor.js b/js/src/server/status/monitor.js
index bb5f79fdd6..fbb49bae2a 100644
--- a/js/src/server/status/monitor.js
+++ b/js/src/server/status/monitor.js
@@ -263,15 +263,15 @@ AJAX.registerOnload('server/status/monitor.js', function () {
             'memory': {
                 title: Messages.strSystemMemory,
                 series: [{
-                    label: Messages.strTotalMemory,
-                    fill: true
-                }, {
                     dataType: 'memory',
                     label: Messages.strUsedMemory,
                     fill: true
+                }, {
+                    label: Messages.strFreeMemory,
+                    fill: true
                 }],
-                nodes: [{ dataPoints: [{ type: 'memory', name: 'MemTotal' }], valueDivisor: 1024 },
-                    { dataPoints: [{ type: 'memory', name: 'MemUsed' }], valueDivisor: 1024 }
+                nodes: [{ dataPoints: [{ type: 'memory', name: 'MemUsed' }], valueDivisor: 1024 },
+                    { dataPoints: [{ type: 'memory', name: 'MemFree' }], valueDivisor: 1024 }
                 ],
                 maxYLabel: 0
             },
@@ -279,14 +279,14 @@ AJAX.registerOnload('server/status/monitor.js', function () {
             'swap': {
                 title: Messages.strSystemSwap,
                 series: [{
-                    label: Messages.strTotalSwap,
-                    fill: true
-                }, {
                     label: Messages.strUsedSwap,
                     fill: true
+                }, {
+                    label: Messages.strFreeSwap,
+                    fill: true
                 }],
-                nodes: [{ dataPoints: [{ type: 'memory', name: 'SwapTotal' }] },
-                    { dataPoints: [{ type: 'memory', name: 'SwapUsed' }] }
+                nodes: [{ dataPoints: [{ type: 'memory', name: 'SwapUsed' }], valueDivisor: 1024 },
+                    { dataPoints: [{ type: 'memory', name: 'SwapFree' }], valueDivisor: 1024 }
                 ],
                 maxYLabel: 0
             }
diff --git a/libraries/classes/Server/SysInfo/WindowsNt.php b/libraries/classes/Server/SysInfo/WindowsNt.php
index 621d694d01..f16b3494a6 100644
--- a/libraries/classes/Server/SysInfo/WindowsNt.php
+++ b/libraries/classes/Server/SysInfo/WindowsNt.php
@@ -130,6 +130,7 @@ class WindowsNt extends Base
         $buffer = $this->getWMI('Win32_PageFileUsage');
 
         $mem['SwapTotal'] = 0;
+        $mem['SwapFree'] = 0;
         $mem['SwapUsed'] = 0;
         $mem['SwapPeak'] = 0;
 
@@ -139,6 +140,8 @@ class WindowsNt extends Base
             $mem['SwapPeak'] += $swapdevice['PeakUsage'] * 1024;
         }
 
+        $mem['SwapFree'] = $mem['SwapTotal'] - $mem['SwapUsed'];
+
         return $mem;
     }
 }