diff --git a/emhttp/languages/en_US/helptext.txt b/emhttp/languages/en_US/helptext.txt
index a900b71ff..1c661b2da 100644
--- a/emhttp/languages/en_US/helptext.txt
+++ b/emhttp/languages/en_US/helptext.txt
@@ -350,6 +350,20 @@ Not much info is printed in the window, but you can verify the operation is runn
 increasing for the device on the Main page.
 :end
 
+:info_ntfs_check_help:
+**Check** will run the *ntfsfix* program to check file system integrity on the device. This utility fixes some common NTFS
+problems; however, it is NOT a Linux version of chkdsk. It only repairs some fundamental NTFS inconsistencies, resets
+the NTFS journal file and schedules an NTFS consistency check for the first boot into Windows.  Note: *ntfsfix* will
+immediately exit if a hibernation file is detected (to prevent corruption).
+
+The *Options* field is initialized with *-d* to clear the volume dirty flag if the volume can be fixed and mounted.
+
+After starting a Check, you should monitor progress and status. Depending on how large the file system is, and what errors
+might be present, the operation can take a **long time** to finish (hours).
+Not much info is printed in the window, but you can verify the operation is running by observing the read/write counters
+increasing for the device on the Main page.
+:end
+
 :info_ext_cancel_help:
 **Cancel** will cancel the Check operation in progress.
 :end
diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index 8e79ee07c..4f7f69369 100644
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -278,6 +278,12 @@ function selectDiskFsProfileEXT() {
   $('#diskFsProfile').val('');
   setDiskFsWidth(1);
 }
+function selectDiskFsProfileNTFS() {
+  $('#diskFsProfile').empty();
+  $('#diskFsProfile').append($('<option>', {value: '', text:''}));
+  $('#diskFsProfile').val('');
+  setDiskFsWidth(1);
+}
 function selectDiskFsProfileBTRFS(slots,init) {
   $('#diskFsProfile').empty();
   $('#diskFsProfile').append($('<option>', {value: 'single', text:_('single')}));
@@ -407,9 +413,11 @@ function selectDiskFsProfile(init) {
     selectDiskFsProfileXFS();
   } else if (fsType.indexOf('ext') != -1) {
     selectDiskFsProfileEXT();
+  } else if (fsType.indexOf('ntfs') != -1) {
+    selectDiskFsProfileNTFS();
   }
 
-  if (subpool != '' || fsType == 'auto' || fsType.indexOf('xfs') != -1 || fsType.indexOf('ext') != -1) {
+  if (subpool != '' || fsType == 'auto' || fsType.indexOf('xfs') != -1 || fsType.indexOf('ext') != -1 || fsType.indexOf('ntfs') != -1) {
     $('#compression').hide(t);
     $('#diskCompression').prop('disabled',true);
   } else {
@@ -586,7 +594,7 @@ function zfsResilver(path) {
 }
 function zfsExpansion(path) {
   $.post('/webGui/include/FileSystemStatus.php',{cmd:'zfs-expansion',path:path},function(data) {
-    if (data.indexOf('expansion')>0 && data.indexOf('in progress')>0) {
+    if (/expansion of \S+ in progress/.test(data)) {
       $('#zfs-button').prop('disabled',true);
       $('#zfs-pool').text(data);
       setTimeout(function(){zfsExpansion(path);},1000);
@@ -633,6 +641,18 @@ function extCheck(path) {
   });
   return false;
 }
+function ntfsCheck(path) {
+  $.post('/webGui/include/FileSystemStatus.php',{cmd:'ntfs-check',path:path},function(data) {
+    $('#ntfs-check').text(data);
+    if (data.slice(-1)!='\0') {
+      setTimeout(function(){ntfsCheck(path);},1000);
+    } else {
+      $.removeCookie('ntfs-check-<?=$tag?>');
+      refresh();
+    }
+  });
+  return false;
+}
 function updateMode(form,mode) {
   $(form).find('input[name="#arg[3]"]').val(mode);
 }
@@ -850,6 +870,7 @@ _(File system type)_:
   <?if (_var($disk,'slots',1) == 1) echo mk_option(_var($disk,'fsType'), "ext4", _('ext4'))?>
   <?if (_var($disk,'slots',1) == 1) echo mk_option(_var($disk,'fsType'), "ext3", _('ext3'), "disabled")?>
   <?if (_var($disk,'slots',1) == 1) echo mk_option(_var($disk,'fsType'), "ext2", _('ext2'), "disabled")?>
+  <?if (_var($disk,'slots',1) == 1) echo mk_option(_var($disk,'fsType'), "ntfs", _('ntfs'))?>
   <?if (_var($disk,'slots',1) == 1) echo mk_option(_var($disk,'fsType'), "reiserfs", _('reiserfs'), "disabled")?>
   <?if (_var($disk,'slots',1) == 1) echo mk_option(_var($disk,'fsType'), "luks:xfs", _('xfs')." - "._('encrypted'))?>
   <?=mk_option(_var($disk, 'fsType'), "luks:zfs", _('zfs')." - "._('encrypted'))?>
@@ -1543,6 +1564,106 @@ _(xfs_repair status)_:
 <?endif;?>
 <?else:?>
 
+&nbsp;
+: <span class="inline-block">
+    <input type="submit" value="_(Check)_" disabled>
+    <span>**_(Check)_** _(is only available when array is Started in **Maintenance** mode)_.
+  </span>
+
+<?endif;?>
+</form>
+<?endif;?>
+<?if (fsType('ntfs')):?>
+<div class="title nocontrol">
+  <span class="left">
+    <i class="title fa fa-shield"></i>_(Check Filesystem Status)_
+  </span>
+</div>
+<form markdown="1" method="POST" action="/update.php" target="progressFrame" onsubmit="prepareFS(this,'ntfs-check-<?=$tag?>','/dev/<?=_var($disk, 'deviceSb')?> <?=_var($disk, 'id')?>')">
+<?if (maintenance_mode()):?>
+<?exec("$docroot/webGui/scripts/ntfs_check status /dev/"._var($disk,'deviceSb')." "._var($disk,'id'), $check_status, $retval)?>
+
+_(ntfsfix_ status)_:
+: <pre id='ntfs-check'><?=implode("\n", $check_status)?></pre>
+
+<?if ($retval == 0 || $retval == 8):?>
+<input type="hidden" name="#command" value="/webGui/scripts/ntfs_check">
+<input type="hidden" name="#arg[1]" value="start">
+<input type="hidden" name="#arg[2]" value="/dev/<?=_var($disk, 'deviceSb')?>">
+<input type="hidden" name="#arg[3]" value="<?=_var($disk, 'id')?>">
+<input type="hidden" name="#arg[4]" value="-d">
+
+&nbsp;
+: <span class="buttons-spaced">
+    <input type="submit" value="_(Check)_">
+    <?if ($retval == 0): ?> _(No file system corruption detected)_.<?endif; ?>
+  </span>
+
+:info_ntfs_check_help:
+
+<?elseif ($retval == 1):?>
+<input type="hidden" name="#command" value="/webGui/scripts/ntfs_check">
+<input type="hidden" name="#arg[1]" value="start">
+<input type="hidden" name="#arg[2]" value="/dev/<?=_var($disk, 'deviceSb')?>">
+<input type="hidden" name="#arg[3]" value="<?=_var($disk, 'id')?>">
+<input type="hidden" name="#arg[4]" value="-e">
+
+&nbsp;
+: <span class="buttons-spaced">
+    <input type="submit" value="_(Fix)_">
+    <span style="color: red;">_(File system corruption detected)_.</span>
+  </span>
+
+:info_ntfs_check_help:
+
+<?elseif ($retval == 2):?>
+<input type="hidden" name="#command" value="/webGui/scripts/ntfs_check">
+<input type="hidden" name="#arg[1]" value="start">
+<input type="hidden" name="#arg[2]" value="/dev/<?=_var($disk, 'deviceSb')?>">
+<input type="hidden" name="#arg[3]" value="<?=_var($disk, 'id')?>">
+<input type="hidden" name="#arg[4]" value="-eL">
+
+&nbsp;
+: <span class="buttons-spaced">
+    <input type="submit" value="_(Zero Log)_">
+    <span style="color: red;">_(Dirty log detected)_.</span>
+  </span>
+
+<p>_(Note)_: _(While there is some risk, if it is not possible to first mount the filesystem to clear the log, zeroing it is the only option to try and repair the filesystem, and in most cases it results in little or no data loss)_.</p>
+
+:info_ntfs_check_help:
+
+<?elseif ($retval == 4):?>
+<input type="hidden" name="#command" value="/webGui/scripts/ntfs_check">
+<input type="hidden" name="#arg[1]" value="start">
+<input type="hidden" name="#arg[2]" value="/dev/<?=_var($disk, 'deviceSb')?>">
+<input type="hidden" name="#arg[3]" value="<?=_var($disk, 'id')?>">
+<input type="hidden" name="#arg[4]" value="-n">
+
+&nbsp;
+: <span class="buttons-spaced">
+    <input type="submit" value="_(Check)_">
+    _(File system corruption fixed)_
+  </span>
+
+:info_ntfs_check_help:
+
+<?elseif ($retval == 9):?>
+<input type="hidden" name="#command" value="/webGui/scripts/ntfs_check">
+<input type="hidden" name="#arg[1]" value="cancel">
+<input type="hidden" name="#arg[2]" value="/dev/<?=_var($disk, 'deviceSb')?>">
+
+&nbsp;
+: <span class="buttons-spaced">
+    <input type="submit" value="_(Cancel)_">
+    *_(Running)_*
+  </span>
+
+:info_ntfs_cancel_help:
+
+<?endif;?>
+<?else:?>
+
 &nbsp;
 : <span class="inline-block">
     <input type="submit" value="_(Check)_" disabled>
@@ -1797,6 +1918,7 @@ $(function() {
   if ($.cookie('zfs-expansion-<?=$tag?>')) status = zfsExpansion($.cookie('zfs-expansion-<?=$tag?>'));
   if ($.cookie('rfs-check-<?=$tag?>')) status = rfsCheck($.cookie('rfs-check-<?=$tag?>'));
   if ($.cookie('xfs-check-<?=$tag?>')) status = xfsCheck($.cookie('xfs-check-<?=$tag?>'));
+  if ($.cookie('ntfs-check-<?=$tag?>')) status = ntfsCheck($.cookie('ntfs-check-<?=$tag?>'));
   if ($.cookie('ext-check-<?=$tag?>')) status = extCheck($.cookie('ext-check-<?=$tag?>'));
   if (status) {
     $.post('/webGui/include/FileSystemStatus.php',{cmd:'status',path:'<?=$tag?>'},function(a){
diff --git a/emhttp/plugins/dynamix/include/FileSystemStatus.php b/emhttp/plugins/dynamix/include/FileSystemStatus.php
index 7b3ff6e5b..5d8648248 100644
--- a/emhttp/plugins/dynamix/include/FileSystemStatus.php
+++ b/emhttp/plugins/dynamix/include/FileSystemStatus.php
@@ -14,7 +14,7 @@
 $docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 
 $cmd  = $_POST['cmd'];
-$path = $_POST['path'];
+$path = escapeshellarg($_POST['path']);
 
 function btrfs($data) {return "btrfs-$data";}
 function zfs($data) {return "zfs-".strtok($data,' ');}
@@ -22,7 +22,7 @@ function zfs($data) {return "zfs-".strtok($data,' ');}
 switch ($cmd) {
 case 'status':
   exec("ps -C btrfs -o cmd=|awk '/$path\$/{print $2}'",$btrfs);
-  exec("/usr/sbin/zpool status $path|grep -Po '(scrub|resilver|expansion) in progress'",$zfs);
+  exec("/usr/sbin/zpool status $path|grep -Po '(scrub|resilver|expansion of \S+) in progress'",$zfs);
   echo implode(',',array_merge(array_map('btrfs',$btrfs),array_map('zfs',$zfs)));
   break;
 case 'btrfs-balance':
diff --git a/emhttp/plugins/dynamix/scripts/ntfs_check b/emhttp/plugins/dynamix/scripts/ntfs_check
new file mode 100755
index 000000000..8297c59e2
--- /dev/null
+++ b/emhttp/plugins/dynamix/scripts/ntfs_check
@@ -0,0 +1,96 @@
+#!/bin/bash
+# ntfs_check start <dev> <id> <options>
+# ntfs_check status <dev> <id>
+# ntfs_check cancel <dev> <id>
+
+# Exit codes:
+# 0 - No corruption detected or process not found.
+# 1 - Corruption detected.
+# 4 - File system corruption fixed.
+# 8 - No check has been run yet.
+# 9 - Process is still running.
+
+# Using /var/lib because that's where btrfs puts status
+mkdir -p /var/lib/ntfs
+
+case "$1" in
+'start')
+    # Start the ntfsfix process in the background and log output
+    rm -f /var/lib/ntfs/check.status.$3
+    {
+        /bin/ntfsfix $4 $2 &> /var/lib/ntfs/check.status.$3
+        echo $? > /var/lib/ntfs/check.status.$3.exit
+    } > /dev/null 2>&1 &
+    echo $! > /var/lib/ntfs/check.pid.$3
+    exit 0
+    ;;
+
+'status')
+    # Check if the process is still running
+    if [ -f /var/lib/ntfs/check.pid.$3 ]; then
+        pid=$(cat /var/lib/ntfs/check.pid.$3)
+        if kill -0 $pid 2>/dev/null; then
+            # Process is running, return status and exit code 9
+            cat /var/lib/ntfs/check.status.$3
+            exit 9
+        else
+            # Process is not running, read the exit status if available
+            if [ -f /var/lib/ntfs/check.status.$3.exit ]; then
+                exit_status=$(cat /var/lib/ntfs/check.status.$3.exit)
+                cat /var/lib/ntfs/check.status.$3
+                rm -f /var/lib/ntfs/check.pid.$3
+    		(( exit_status & 1 )) && exit 4
+    		(( exit_status & 6 )) && exit 1
+		exit 0
+            else
+                # Exit status file does not exist, but return status file if available
+                if [ -f /var/lib/ntfs/check.status.$3 ]; then
+                    cat /var/lib/ntfs/check.status.$3
+                fi
+                exit 8
+            fi
+        fi
+    else
+        # No PID file found, check for existing status
+        if [ -f /var/lib/ntfs/check.status.$3 ]; then
+            cat /var/lib/ntfs/check.status.$3
+            # If no exit status file, assume process completed successfully
+            if [ -f /var/lib/ntfs/check.status.$3.exit ]; then
+                exit_status=$(cat /var/lib/ntfs/check.status.$3.exit)
+    		(( exit_status & 1 )) && exit 4
+    		(( exit_status & 4 )) && exit 1
+                exit 0
+            else
+                exit 8
+            fi
+        else
+            # No status file found
+            echo "Not available"
+            exit 8
+        fi
+    fi
+    ;;
+
+'cancel')
+    # Cancel the ntfsfix process
+    if [ -f /var/lib/ntfs/check.pid.$3 ]; then
+        pid=$(cat /var/lib/ntfs/check.pid.$3)
+        kill $pid
+        while kill -0 $pid 2>/dev/null; do
+            sleep 1
+        done
+        echo -e "\nCancelled" >> /var/lib/ntfs/check.status.$3
+        rm -f /var/lib/ntfs/check.pid.$3
+    else
+        echo "No process to cancel"
+    fi
+
+    exit 0
+    ;;
+
+*)
+    # Handle invalid commands
+    echo "Invalid command"
+    exit 0
+    ;;
+esac