diff --git a/app/views/console/comps/permissions-matrix.phtml b/app/views/console/comps/permissions-matrix.phtml
index 7883ef4879..068177163c 100644
--- a/app/views/console/comps/permissions-matrix.phtml
+++ b/app/views/console/comps/permissions-matrix.phtml
@@ -74,7 +74,8 @@ $escapedPermissions = \array_map(function ($perm) {
 
                     <input
                         required
-                        id="<?php echo $form; ?>Input"
+                        autocomplete="off"
+                        :id="'<?php echo $form; ?>Input' + index"
                         name="<?php echo $form; ?>"
                         form="<?php echo $form ?>"
                         list="types"
diff --git a/public/scripts/permissions-matrix.js b/public/scripts/permissions-matrix.js
index 57c38554f1..f2166504e6 100644
--- a/public/scripts/permissions-matrix.js
+++ b/public/scripts/permissions-matrix.js
@@ -33,8 +33,12 @@
                     }
                 });
             },
-            addPermission() {
-                this.permissions.push({ role: '' });
+            addPermission(formId) {
+                if (this.permissions.length > 0
+                    && !this.validate(formId, this.permissions.length - 1)) {
+                    return;
+                }
+                this.permissions.push({role: ''});
             },
             updatePermission(index) {
                 // Because the x-model does not update before the click event,