diff --git a/app/Http/Requests/Auth/Permission.php b/app/Http/Requests/Auth/Permission.php
index 62fbdf3f0..1db6dee40 100644
--- a/app/Http/Requests/Auth/Permission.php
+++ b/app/Http/Requests/Auth/Permission.php
@@ -23,8 +23,15 @@ class Permission extends FormRequest
      */
     public function rules()
     {
+        // Check if store or update
+        if ($this->getMethod() == 'PATCH') {
+            $id = $this->role->getAttribute('id');
+        } else {
+            $id = null;
+        }
+
         return [
-            'name' => 'required|string|unique:permissions,name',
+            'name' => 'required|string|unique:permissions,name,' . $id,
             'display_name' => 'required|string',
         ];
     }
diff --git a/app/Http/Requests/Auth/Role.php b/app/Http/Requests/Auth/Role.php
index 0caa9beaa..31873e5d1 100644
--- a/app/Http/Requests/Auth/Role.php
+++ b/app/Http/Requests/Auth/Role.php
@@ -23,8 +23,15 @@ class Role extends FormRequest
      */
     public function rules()
     {
+        // Check if store or update
+        if ($this->getMethod() == 'PATCH') {
+            $id = $this->role->getAttribute('id');
+        } else {
+            $id = null;
+        }
+
         return [
-            'name' => 'required|string|unique:roles,name',
+            'name' => 'required|string|unique:roles,name,' . $id,
             'display_name' => 'required|string',
             'permissions' => 'required'
         ];