diff --git a/app/Modules/Storage/Http/Controllers/Admin/DirectoriesController.php b/app/Modules/Storage/Http/Controllers/Admin/DirectoriesController.php
index d6081012e..cdca88739 100644
--- a/app/Modules/Storage/Http/Controllers/Admin/DirectoriesController.php
+++ b/app/Modules/Storage/Http/Controllers/Admin/DirectoriesController.php
@@ -311,6 +311,11 @@ public function store(Request $request, $data = array(), $offset = 0): RedirectR
 			return redirect()->back()->withError(trans('Field `name` has invalid format'));
 		}
 
+		if ($row->autouser == 0)
+		{
+			$row->autouserunixgroupid = 0;
+		}
+
 		if (!$row->autouserunixgroupid)
 		{
 			$row->autouserunixgroupid = $row->unixgroupid;
diff --git a/app/Modules/Storage/Http/Controllers/Api/DirectoriesController.php b/app/Modules/Storage/Http/Controllers/Api/DirectoriesController.php
index 1bc3eab3c..5ead9e6ab 100644
--- a/app/Modules/Storage/Http/Controllers/Api/DirectoriesController.php
+++ b/app/Modules/Storage/Http/Controllers/Api/DirectoriesController.php
@@ -527,6 +527,11 @@ public function create(Request $request, $data = array(), $offset = 0)
 			return response()->json(['message' => trans('Field `name` has invalid format')], 415);
 		}
 
+		if ($row->autouser == 0)
+		{
+			$row->autouserunixgroupid = 0;
+		}
+
 		if (!$row->autouserunixgroupid)
 		{
 			$row->autouserunixgroupid = $row->unixgroupid;
@@ -1197,6 +1202,10 @@ public function update($id, Request $request)
 					$this->create($request, $data);
 				}
 			}
+			else
+			{
+				$row->autouserunixgroupid = $row->unixgroupid;
+			}
 		}
 
 		$row->save();