diff --git a/src/Controllers/UserController.php b/src/Controllers/UserController.php
index 5b4fb29b..01a9cfd2 100644
--- a/src/Controllers/UserController.php
+++ b/src/Controllers/UserController.php
@@ -212,6 +212,8 @@ class UserController
 			$user->enableEndlessScrolling(InputHelper::get('endless-scrolling'));
 
 			R::store($user);
+			if ($user->id == $this->context->user->id)
+				$this->context->user = $user;
 			AuthController::doReLog();
 			$this->context->transport->success = true;
 		}