diff --git a/packages/Webkul/User/src/Http/Controllers/RoleController.php b/packages/Webkul/User/src/Http/Controllers/RoleController.php
index f80f42a73..19aed719c 100755
--- a/packages/Webkul/User/src/Http/Controllers/RoleController.php
+++ b/packages/Webkul/User/src/Http/Controllers/RoleController.php
@@ -2,9 +2,7 @@
 
 namespace Webkul\User\Http\Controllers;
 
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Event;
-use Webkul\User\Repositories\AdminRepository;
 use Webkul\User\Repositories\RoleRepository;
 
 class RoleController extends Controller
@@ -23,26 +21,17 @@ class RoleController extends Controller
      */
     protected $roleRepository;
 
-    /**
-     * AdminRepository object
-     *
-     * @var \Webkul\User\Repositories\AdminRepository
-     */
-    protected $adminRepository;
-
     /**
      * Create a new controller instance.
      *
      * @param  \Webkul\User\Repositories\RoleRepository  $roleRepository
-     * @param  \Webkul\User\Repositories\AdminRepository  $adminRepository
      * @return void
      */
-    public function __construct(RoleRepository $roleRepository, AdminRepository $adminRepository)
+    public function __construct(RoleRepository $roleRepository)
     {
         $this->middleware('admin');
 
         $this->roleRepository = $roleRepository;
-        $this->adminRepository = $adminRepository;
 
         $this->_config = request('_config');
     }
@@ -118,24 +107,11 @@ class RoleController extends Controller
 
         Event::dispatch('user.role.update.before', $id);
 
-        if (request()->permission_type != 'all'){
-            if ($this->roleRepository->findWhere(['permission_type' => 'all'], 'permission_type')->count() > 1){
-                $role = $this->roleRepository->update(request()->all(), $id);
-                Event::dispatch('user.role.update.after', $role);
-                session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Role']));
-                if($this->adminRepository->findWhere(['id' => auth()->guard('admin')->user()->id, 'role_id' => $id], 'role_id')->count() > 0){
-                    auth()->guard('admin')->logout();
-                }
-            }
-            else{
-                session()->flash('error', trans('This is last Role with ALL permission.'));
-            }
-        }
-        else{
-            $role = $this->roleRepository->update(request()->all(), $id);
-            Event::dispatch('user.role.update.after', $role);
-            session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Role']));
-        }
+        $role = $this->roleRepository->update(request()->all(), $id);
+
+        Event::dispatch('user.role.update.after', $role);
+
+        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Role']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -154,8 +130,6 @@ class RoleController extends Controller
             session()->flash('error', trans('admin::app.response.being-used', ['name' => 'Role', 'source' => 'Admin User']));
         } elseif($this->roleRepository->count() == 1) {
             session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Role']));
-        } elseif($this->roleRepository->findWhere(['permission_type' => 'all'], 'permission_type')->count() > 1) {
-            session()->flash('error', trans('This is last Role with ALL permission.'));
         } else {
             try {
                 Event::dispatch('user.role.delete.before', $id);
diff --git a/packages/Webkul/User/src/Http/Controllers/UserController.php b/packages/Webkul/User/src/Http/Controllers/UserController.php
index 467034f6c..06d58e228 100755
--- a/packages/Webkul/User/src/Http/Controllers/UserController.php
+++ b/packages/Webkul/User/src/Http/Controllers/UserController.php
@@ -144,30 +144,15 @@ class UserController extends Controller
 
         Event::dispatch('user.admin.update.before', $id);
 
-        $countAdmins = 0;
-        if ($this->roleRepository->find($data['role_id'])->permission_type != "all"){
-            foreach ($this->adminRepository->get('role_id') as $userRole){
-                if ($userRole->role_id == 1){
-                    $countAdmins++;
-                    if ($countAdmins > 1){
-                        break;
-                    }
-                }
-            }
-            if ($countAdmins == 1){
-                session()->flash('error', trans('This is last User with ALL permission.'));
-            }
+        $admin = $this->adminRepository->update($data, $id);
+
+        if ($isPasswordChanged) {
+            Event::dispatch('user.admin.update-password', $admin);
         }
 
-        if ($countAdmins != 1){
-            $admin = $this->adminRepository->update($data, $id);
+        Event::dispatch('user.admin.update.after', $admin);
 
-            if ($isPasswordChanged) {
-                Event::dispatch('user.admin.update-password', $admin);
-            }
-            Event::dispatch('user.admin.update.after', $admin);
-            session()->flash('success', trans('admin::app.response.update-success', ['name' => 'User']));
-        }
+        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'User']));
 
         return redirect()->route($this->_config['redirect']);
     }