diff --git a/lib/private/Avatar.php b/lib/private/Avatar.php
index fc1909c3bdaff..efbebfd55cde0 100644
--- a/lib/private/Avatar.php
+++ b/lib/private/Avatar.php
@@ -135,8 +135,9 @@ public function set ($data) {
 		}
 
 		$this->remove();
-		$this->folder->newFile('avatar.'.$type)->putContent($data);
-		$this->user->triggerChange('avatar');
+		$file = $this->folder->newFile('avatar.'.$type);
+		$file->putContent($data);
+		$this->user->triggerChange('avatar', $file);
 	}
 
 	/**
@@ -155,7 +156,7 @@ public function remove () {
 				$avatar->delete();
 			}
 		}
-		$this->user->triggerChange('avatar');
+		$this->user->triggerChange('avatar', '');
 	}
 
 	/**