diff --git a/app/controllers/web/console.php b/app/controllers/web/console.php
index f2ffad4162..0d885485e9 100644
--- a/app/controllers/web/console.php
+++ b/app/controllers/web/console.php
@@ -288,13 +288,13 @@ App::get('/console/databases/collection')
         $permissions = new View(__DIR__ . '/../../views/console/comps/permissions-matrix.phtml');
         $permissions
             ->setParam('method', 'databases.getCollection')
-            ->setParam('events', 'load,databases.updateCollection')
+            ->setParam('events', 'databases.updateCollection')
             ->setParam('data', 'project-collection')
             ->setParam('params', [
                 'collection-id' => '{{router.params.id}}',
                 'database-id' => '{{router.params.databaseId}}'
             ]);
-        
+
         $page = new View(__DIR__ . '/../../views/console/databases/collection.phtml');
 
         $page
@@ -336,11 +336,14 @@ App::get('/console/databases/document')
         ;
 
         $permissions = new View(__DIR__ . '/../../views/console/comps/permissions-matrix.phtml');
-        
+
         $permissions
             ->setParam('method', 'databases.getDocument')
             ->setParam('data', 'project-document')
-            ->setParam('permissions', \array_filter(Database::PERMISSIONS, fn ($perm) => $perm != Database::PERMISSION_CREATE))
+            ->setParam('permissions', \array_filter(
+                Database::PERMISSIONS,
+                fn ($perm) => $perm != Database::PERMISSION_CREATE
+            ))
             ->setParam('params', [
                 'collection-id' => '{{router.params.collection}}',
                 'database-id' => '{{router.params.databaseId}}',
@@ -370,18 +373,21 @@ App::get('/console/databases/document/new')
     ->param('collection', '', new UID(), 'Collection unique ID.')
     ->inject('layout')
     ->action(function (string $databaseId, string $collection, View $layout) {
-        
+
         $permissions = new View(__DIR__ . '/../../views/console/comps/permissions-matrix.phtml');
 
         $permissions
             ->setParam('data', 'project-document')
-            ->setParam('permissions', \array_filter(Database::PERMISSIONS, fn ($perm) => $perm != Database::PERMISSION_CREATE))
+            ->setParam('permissions', \array_filter(
+                Database::PERMISSIONS,
+                fn ($perm) => $perm != Database::PERMISSION_CREATE
+            ))
             ->setParam('params', [
                 'collection-id' => '{{router.params.collection}}',
                 'database-id' => '{{router.params.databaseId}}',
                 'document-id' => '{{router.params.id}}',
             ]);
-        
+
         $page = new View(__DIR__ . '/../../views/console/databases/document.phtml');
 
         $page
diff --git a/app/views/console/comps/permissions-matrix.phtml b/app/views/console/comps/permissions-matrix.phtml
index 1e34e2fa65..635422e79c 100644
--- a/app/views/console/comps/permissions-matrix.phtml
+++ b/app/views/console/comps/permissions-matrix.phtml
@@ -2,12 +2,14 @@
 
 use Utopia\Database\Database;
 
+// Data
 $method = $this->getParam('method', '');
 $params = $this->getParam('params', []);
 $events = $this->getParam('events', '');
-$data = $this->getParam('data', '');
-$form = $this->getParam('form', 'permissionsForm');
 $permissions = $this->getParam('permissions', Database::PERMISSIONS);
+// Names
+$data = $this->getParam('data', '');
+$form = $this->getParam('form', 'form');
 
 $escapedPermissions = \array_map(function ($perm) {
     // Alpine won't bind to a parameter named delete :/
@@ -31,11 +33,9 @@ $escapedPermissions = \array_map(function ($perm) {
     class="permissions-matrix margin-bottom-large"
     x-data="permissionsMatrix">
 
-    <form id="<?php echo $form ?>"></form>
-
     <input
         type="hidden"
-        name="<?php echo $form; ?>"
+        name="permissions"
         data-cast-from="csv"
         data-cast-to="array"
         data-ls-bind="{{<?php echo $data ?>.$permissions}}"
@@ -74,7 +74,7 @@ $escapedPermissions = \array_map(function ($perm) {
             </tr>
         </template>
         <tr x-data="permissionsRow"
-            @addrow.window="addPermission(<?php echo $form; ?>,role,{<?php echo \implode(',', $escapedPermissions) ?>})">
+            @addrow.window="addPermission('<?php echo $form; ?>',role,{<?php echo \implode(',', $escapedPermissions) ?>})">
             <td>
                 <datalist id="types">
                     <option value="user:">
@@ -103,7 +103,7 @@ $escapedPermissions = \array_map(function ($perm) {
         </tbody>
         <tfoot>
         <tr>
-            <td colspan="6">
+            <td colspan="<?php \count($permissions) + 2 ?>">
                 <button type="button" class="btn btn-primary margin-top-small" @click="$dispatch('addrow')">Add</button>
             </td>
         </tr>
diff --git a/app/views/console/databases/collection.phtml b/app/views/console/databases/collection.phtml
index f5f037a248..449af62ffe 100644
--- a/app/views/console/databases/collection.phtml
+++ b/app/views/console/databases/collection.phtml
@@ -511,6 +511,7 @@ $permissions = $this->getParam('permissions', null);
 
                 <div class="row responsive margin-top-negative">
                     <div class="col span-8 margin-bottom">
+                        <form id="<?php echo $permissions->getParam('form', 'permissions') ?>"></form>
 
                         <form
                             data-analytics
diff --git a/app/views/console/databases/document.phtml b/app/views/console/databases/document.phtml
index e201b31fe2..121ba9d838 100644
--- a/app/views/console/databases/document.phtml
+++ b/app/views/console/databases/document.phtml
@@ -53,6 +53,8 @@ $permissions = $this->getParam('permissions', null);
 
                     <div class="row responsive">
                         <div class="col span-8 margin-bottom">
+                            <form id="<?php echo $permissions->getParam('form', 'permissions') ?>"></form>
+
                             <form
                                 data-analytics
                                 data-analytics-activity