diff --git a/lib/private/AvatarManager.php b/lib/private/AvatarManager.php
index 703825156253..aa32ab0da3d6 100644
--- a/lib/private/AvatarManager.php
+++ b/lib/private/AvatarManager.php
@@ -33,6 +33,7 @@
 use OCP\IUserManager;
 use OCP\Files\IRootFolder;
 use OCP\IL10N;
+use OCP\IUser;
 
 /**
  * This class implements methods to access Avatar functionality
@@ -86,7 +87,7 @@ public function getAvatar($userId) {
 
 		$userId = $user->getUID();
 
-		$avatarsFolder = $this->getAvatarFolder($userId);
+		$avatarsFolder = $this->getAvatarFolder($user);
 		return new Avatar($avatarsFolder, $this->l, $user, $this->logger);
 	}
 
@@ -106,14 +107,14 @@ private function buildAvatarPath($userId) {
 	/**
 	 * Returns the avatar folder for the given user
 	 *
-	 * @param $userId user id
+	 * @param IUser $user user
 	 * @return Folder|\OCP\Files\Node
 	 *
 	 * @internal
 	 */
-	public function getAvatarFolder($userId) {
+	public function getAvatarFolder(IUser $user) {
 		$avatarsFolder = $this->getFolder($this->rootFolder, 'avatars');
-		$parts = $this->buildAvatarPath($userId);
+		$parts = $this->buildAvatarPath($user->getUID());
 		foreach ($parts as $part) {
 			$avatarsFolder = $this->getFolder($avatarsFolder, $part);
 		}
diff --git a/lib/private/Repair/MoveAvatarOutsideHome.php b/lib/private/Repair/MoveAvatarOutsideHome.php
index e302d880facf..0a61a59d744d 100644
--- a/lib/private/Repair/MoveAvatarOutsideHome.php
+++ b/lib/private/Repair/MoveAvatarOutsideHome.php
@@ -110,7 +110,7 @@ private function moveAvatars(IOutput $out, IUser $user) {
 			$oldAvatarUserFolder = $this->rootFolder->get('/' . $userId);
 			$oldAvatar = new Avatar($oldAvatarUserFolder, $this->l, $user, $this->logger);
 			if ($oldAvatar->exists()) {
-				$newAvatarsUserFolder = $this->avatarManager->getAvatarFolder($userId);
+				$newAvatarsUserFolder = $this->avatarManager->getAvatarFolder($user);
 
 				// get original file
 				$oldAvatarFile = $oldAvatar->getFile(-1);
diff --git a/tests/lib/AvatarManagerTest.php b/tests/lib/AvatarManagerTest.php
index 262d540def78..e9b2e69a6bb6 100644
--- a/tests/lib/AvatarManagerTest.php
+++ b/tests/lib/AvatarManagerTest.php
@@ -120,7 +120,7 @@ public function testGetAvatarValidUserDifferentCasing() {
 		$folder = $this->createMock(Folder::class);
 		$this->avatarManager->expects($this->once())
 			->method('getAvatarFolder')
-			->with('valid-user')
+			->with($user)
 			->willReturn($folder);
 
 		$avatar = $this->avatarManager->getAvatar('vaLid-USER');