diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index 24f48069..d8650b85 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -208,6 +208,7 @@ class UserController extends Controller
      * @param DeleteUserRequest $request
      * @param User $user
      * @return ResponseFactory|Response
+     * @throws \Exception
      */
     public function delete_user(DeleteUserRequest $request, User $user)
     {
@@ -223,47 +224,10 @@ class UserController extends Controller
             abort(406, "You can\'t delete your account");
         }
 
-        // Validate user name
-        if ($user->name !== $request->input('data.name')) abort(403);
-
-        $shares = Share::where('user_id', $user->id)->get();
-
-        $files = File::withTrashed()
-            ->where('user_id', $user->id)
-            ->get();
-        $folders = Folder::withTrashed()
-            ->where('user_id', $user->id)
-            ->get();
-
-        // Remove all files and thumbnails
-        $files->each(function ($file) {
-
-            // Delete file
-            Storage::delete('/file-manager/' . $file->basename);
-
-            // Delete thumbnail if exist
-            if (!is_null($file->thumbnail)) {
-                Storage::delete('/file-manager/' . $file->getRawOriginal('thumbnail'));
-            }
-
-            // Delete file permanently
-            $file->forceDelete();
-        });
-
-        // Remove avatar
-        if ($user->avatar) {
-            Storage::delete('/avatars/' . $user->avatar);
+        if ($user->settings->name !== $request->name) {
+            abort(403, "The name you typed is wrong!");
         }
 
-        // Remove folders & shares
-        $folders->each->forceDelete();
-        $shares->each->forceDelete();
-
-        // Remove favourites
-        $user->settings->delete();
-        $user->favourite_folders()->sync([]);
-
-        // Delete user
         $user->delete();
 
         return response('Done!', 204);
diff --git a/app/Http/Controllers/FileFunctions/FavouriteController.php b/app/Http/Controllers/FileFunctions/FavouriteController.php
index c31cbf32..9d058b67 100644
--- a/app/Http/Controllers/FileFunctions/FavouriteController.php
+++ b/app/Http/Controllers/FileFunctions/FavouriteController.php
@@ -32,12 +32,12 @@ class FavouriteController extends Controller
 
             // Add folder to user favourites
             $user
-                ->favourite_folders()
+                ->favouriteFolders()
                 ->syncWithoutDetaching($id);
         }
 
         // Return updated favourites
-        return response($user->favourite_folders, 204);
+        return response($user->favouriteFolders, 204);
     }
 
     /**
@@ -56,9 +56,9 @@ class FavouriteController extends Controller
         }
 
         // Remove folder from user favourites
-        $user->favourite_folders()->detach($id);
+        $user->favouriteFolders()->detach($id);
 
         // Return updated favourites
-        return response($user->favourite_folders, 204);
+        return response($user->favouriteFolders, 204);
     }
 }
diff --git a/app/Http/Requests/Admin/DeleteUserRequest.php b/app/Http/Requests/Admin/DeleteUserRequest.php
index 92c29028..760823b2 100644
--- a/app/Http/Requests/Admin/DeleteUserRequest.php
+++ b/app/Http/Requests/Admin/DeleteUserRequest.php
@@ -24,7 +24,7 @@ class DeleteUserRequest extends FormRequest
     public function rules()
     {
         return [
-            'data.name' => 'required|string|max:255',
+            'name' => 'required|string|max:255',
         ];
     }
 }
diff --git a/app/Http/Resources/UserResource.php b/app/Http/Resources/UserResource.php
index 295b9d7b..dee831bc 100644
--- a/app/Http/Resources/UserResource.php
+++ b/app/Http/Resources/UserResource.php
@@ -65,7 +65,7 @@ class UserResource extends JsonResource
                         'id'         => '1',
                         'type'       => 'folders_favourite',
                         'attributes' => [
-                            'folders' => $this->favourite_folders->makeHidden(['pivot'])
+                            'folders' => $this->favouriteFolders->makeHidden(['pivot'])
                         ],
                     ],
                 ],
diff --git a/app/Http/Tools/Demo.php b/app/Http/Tools/Demo.php
index 2f1ae6ff..d5357f96 100644
--- a/app/Http/Tools/Demo.php
+++ b/app/Http/Tools/Demo.php
@@ -144,6 +144,6 @@ class Demo
     public static function favourites($user)
     {
 
-        return $user->favourite_folders->makeHidden(['pivot']);
+        return $user->favouriteFolders->makeHidden(['pivot']);
     }
 }
\ No newline at end of file
diff --git a/app/Models/User.php b/app/Models/User.php
index 2424cbc0..91e43006 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -3,8 +3,11 @@
 namespace App\Models;
 
 use App\Notifications\ResetPassword;
+use App\Services\HelperService;
+use App\Services\StripeService;
 use ByteUnits\Metric;
 use Carbon\Carbon;
+use DB;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
@@ -59,10 +62,8 @@ class User extends Authenticatable
      */
     public function taxRates()
     {
-        $stripe = resolve('App\Services\StripeService');
-
         // Get tax rates
-        $rates = collect($stripe->getTaxRates());
+        $rates = collect(resolve(StripeService::class)->getTaxRates());
 
         // Find tax rate
         $user_tax_rate = $rates->first(function ($item) {
@@ -205,7 +206,7 @@ class User extends Authenticatable
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
-    public function favourite_folders()
+    public function favouriteFolders()
     {
         return $this->belongsToMany(Folder::class, 'favourite_folder', 'user_id', 'folder_id', 'id', 'id')
             ->with('shared:token,id,item_id,permission,is_protected,expire_in');
@@ -258,12 +259,16 @@ class User extends Authenticatable
     {
         parent::boot();
 
-        static::creating(function ($model) {
-            // Store uuid into model
-            $model->id = Str::uuid();
+        static::creating(function ($user) {
+            $user->id = Str::uuid();
 
-            // Create user directory
-            Storage::makeDirectory("files/$model->id");
+            // Create user directory for his files
+            Storage::makeDirectory("files/$user->id");
+        });
+
+        static::deleted(function ($user) {
+            resolve(HelperService::class)
+                ->erase_user_data($user);
         });
     }
 }
diff --git a/app/Services/HelperService.php b/app/Services/HelperService.php
new file mode 100644
index 00000000..663240ab
--- /dev/null
+++ b/app/Services/HelperService.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Services;
+
+use DB;
+use Illuminate\Support\Facades\Storage;
+
+class HelperService
+{
+    /**
+     * Delete all user data including files, folders, avatar etc.
+     *
+     * @param $user
+     */
+    public function erase_user_data($user)
+    {
+        // Delete user avatar if exists
+        if ($user->settings->getRawOriginal('avatar')) {
+            Storage::delete($user->settings->getRawOriginal('avatar'));
+        }
+
+        // Delete all user files
+        Storage::deleteDirectory("files/$user->id");
+
+        // Delete all user records in database
+        collect(['folders', 'files', 'user_settings', 'shares', 'favourite_folder', 'zips'])
+            ->each(function ($table) use ($user) {
+                DB::table($table)
+                    ->whereUserId($user->id)
+                    ->delete();
+            });
+    }
+}
\ No newline at end of file
diff --git a/tests/Feature/AdminTest.php b/tests/Feature/AdminTest.php
index 20f8fd5b..a26bb9da 100644
--- a/tests/Feature/AdminTest.php
+++ b/tests/Feature/AdminTest.php
@@ -3,9 +3,14 @@
 namespace Tests\Feature;
 
 use App\Models\File;
+use App\Models\Folder;
 use App\Models\Setting;
+use App\Models\Share;
 use App\Models\User;
+use App\Models\Zip;
 use App\Notifications\ResetPassword;
+use App\Services\SetupService;
+use Carbon\Carbon;
 use DB;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Http\UploadedFile;
@@ -18,6 +23,12 @@ class AdminTest extends TestCase
 {
     use DatabaseMigrations;
 
+    public function __construct()
+    {
+        parent::__construct();
+        $this->setup = app()->make(SetupService::class);
+    }
+
     /**
      * @test
      */
@@ -303,6 +314,125 @@ class AdminTest extends TestCase
         ]);
 
         Storage::disk('local')
-            ->assertExists(User::whereEmail('john@doe.com')->first()->settings->getRawOriginal('avatar'));
+            ->assertExists(
+                User::whereEmail('john@doe.com')->first()->settings->getRawOriginal('avatar')
+            );
+    }
+
+    /**
+     * @test
+     */
+    public function it_delete_user_with_all_data()
+    {
+        Storage::fake('local');
+
+        $this->setup->create_directories();
+
+        // Create and login user
+        $user = User::factory(User::class)
+            ->create(['role' => 'user']);
+
+        Sanctum::actingAs($user);
+
+        // Create folders
+        $folders = Folder::factory(Folder::class)
+            ->count(2)
+            ->create(['user_id' => $user->id]);
+
+        // Create favourite folders
+        $folders->each(function ($folder) use ($user) {
+            $user->favouriteFolders()->attach($folder->id);
+        });
+
+        // Create zips
+        Zip::factory(Zip::class)
+            ->count(2)
+            ->create(['user_id' => $user->id]);
+
+        // Create shares
+        Share::factory(Share::class)
+            ->count(2)
+            ->create(['user_id' => $user->id]);
+
+        // Upload files
+        collect([0, 1])
+            ->each(function ($index) {
+
+                $file = UploadedFile::fake()
+                    ->create("fake-file-$index.pdf", 1200, 'application/pdf');
+
+                $this->postJson('/api/upload', [
+                    'file'      => $file,
+                    'folder_id' => null,
+                    'is_last'   => true,
+                ])->assertStatus(201);
+            });
+
+        $file_ids = File::all()
+            ->pluck('id');
+
+        // Upload avatar
+        $avatar = UploadedFile::fake()
+            ->image('fake-image.jpg');
+
+        $this->patchJson('/api/user/relationships/settings', [
+            'avatar' => $avatar,
+        ])->assertStatus(204);
+
+        $user = User::whereRole('user')
+            ->first();
+
+        // Create and login admin
+        $admin = User::factory(User::class)
+            ->create(['role' => 'admin']);
+
+        Sanctum::actingAs($admin);
+
+        // Delete user
+        $this->deleteJson("/api/admin/users/$user->id/delete", [
+            'name' => $user->settings->name
+        ])
+            ->assertStatus(204);
+
+        $this->assertDatabaseMissing('user_settings', [
+            'user_id' => $user->id,
+        ]);
+
+        $this->assertDatabaseMissing('folders', [
+            'user_id' => $user->id,
+        ]);
+
+        $this->assertDatabaseMissing('shares', [
+            'user_id' => $user->id,
+        ]);
+
+        $this->assertDatabaseMissing('favourite_folder', [
+            'user_id' => $user->id,
+        ]);
+
+        $this->assertDatabaseMissing('files', [
+            'user_id' => $user->id,
+        ]);
+
+        $this->assertDatabaseMissing('zips', [
+            'user_id' => $user->id,
+        ]);
+
+        $file_ids
+            ->each(function ($id, $index) use ($user) {
+
+                Storage::disk('local')
+                    ->assertMissing(
+                        "files/$user->id/fake-file-$index.pdf"
+                    );
+
+                Storage::disk('local')
+                    ->assertMissing(
+                        "files/fake-file-$index.pdf"
+                    );
+            });
+
+        Storage::disk('local')
+            ->assertMissing($user->settings->getRawOriginal('avatar'));
     }
 }
diff --git a/tests/Feature/FolderTest.php b/tests/Feature/FolderTest.php
index 99722f6a..396c87e6 100644
--- a/tests/Feature/FolderTest.php
+++ b/tests/Feature/FolderTest.php
@@ -195,7 +195,7 @@ class FolderTest extends TestCase
         Sanctum::actingAs($user);
 
         $user
-            ->favourite_folders()
+            ->favouriteFolders()
             ->attach($folder->id);
 
         $this->deleteJson("/api/folders/favourites/$folder->id")
@@ -252,8 +252,8 @@ class FolderTest extends TestCase
         $folder_2 = Folder::factory(Folder::class)
             ->create();
 
-        $user->favourite_folders()->attach($folder_1->id);
-        $user->favourite_folders()->attach($folder_2->id);
+        $user->favouriteFolders()->attach($folder_1->id);
+        $user->favouriteFolders()->attach($folder_2->id);
 
         Sanctum::actingAs($user);