diff --git a/actions/avatar.php b/actions/avatar.php
index 374cef4132..16a3dd48cf 100644
--- a/actions/avatar.php
+++ b/actions/avatar.php
@@ -205,8 +205,10 @@ class AvatarAction extends SettingsAction {
 		$avatar->profile_id = $user->id;
 		$avatar->find();
 		while ($avatar->fetch()) {
+			unlink(common_avatar_path($avatar->filename));
 			$avatar->delete();
 		}
+		return true;
 	}
 }