diff --git a/Changelog b/Changelog
index 7379f14c9..4fffb711f 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2018-08-01 DariusIII
+	* Fix: User account deletion from user profile
 	* Fix: Fix role and user excluded categories display
 	* Chg: Update user-list admin template
 	* Chg: Add back removed parts of getRange function queries in User model
diff --git a/app/Http/Controllers/BasePageController.php b/app/Http/Controllers/BasePageController.php
index 1c1b23d6e..a3152a971 100644
--- a/app/Http/Controllers/BasePageController.php
+++ b/app/Http/Controllers/BasePageController.php
@@ -113,7 +113,7 @@ class BasePageController extends Controller
     protected function setPrefs(): void
     {
         if (Auth::check()) {
-            $this->userdata = Auth::user();
+            $this->userdata = User::find(Auth::id());
             $this->setUserPreferences();
         } else {
             $this->theme = Settings::settingValue('site.main.style');
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index a8c0e2b61..e13c053b8 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -301,15 +301,14 @@ class ProfileController extends BasePageController
         $this->setPrefs();
         $userId = $request->input('id');
 
-        if ($userId !== null && $this->userdata->role->id !== User::ROLE_ADMIN && (int) $userId === Auth::id()) {
+        if ($userId !== null && $this->userdata->hasRole('Admin') === false && (int) $userId === Auth::id()) {
             Mail::to(Settings::settingValue('site.main.email'))->send(new AccountDeleted($userId));
-            Auth::logout();
             User::deleteUser($userId);
 
             return redirect('login');
         }
 
-        if ($this->userdata->role->id === User::ROLE_ADMIN) {
+        if ($this->userdata->hasRole('Admin')) {
             return redirect('profile');
         }