diff --git a/.htaccess b/.htaccess
index 7bf8759e38..26be470fd1 100644
--- a/.htaccess
+++ b/.htaccess
@@ -78,3 +78,7 @@ Options -Indexes
 <IfModule pagespeed_module>
   ModPagespeed Off
 </IfModule>
+#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####
+
+ErrorDocument 403 /core/templates/403.php
+ErrorDocument 404 /core/templates/404.php
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index 127eef423e..ce0444a76b 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -1221,7 +1221,7 @@ class Manager implements IManager {
 			$path = $path->getParent();
 		}
 
-		$users = [];
+		$users = [$owner => 'null'];
 		$public = false;
 		$remote = false;
 		foreach ($shares as $share) {
diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php
index 20ba62fa22..bbdef2130f 100644
--- a/tests/lib/Share20/ManagerTest.php
+++ b/tests/lib/Share20/ManagerTest.php
@@ -2811,7 +2811,7 @@ class ManagerTest extends \Test\TestCase {
 			->willReturn($userFolder);
 
 		$expected = [
-			'users' => ['user1', 'user2'],
+			'users' => ['owner', 'user1', 'user2'],
 			'public' => true,
 			'remote' => true,
 		];