diff --git a/src/api/users.js b/src/api/users.js
index 8080a9ca0d..08d4bc6af1 100644
--- a/src/api/users.js
+++ b/src/api/users.js
@@ -265,7 +265,6 @@ async function processDeletion({ uid, method, password, caller }) {
 		}
 	}
 
-	// TODO: clear user tokens for this uid
 	await flags.resolveFlag('user', uid, caller.uid);
 
 	let userData;
diff --git a/src/user/delete.js b/src/user/delete.js
index a12c424d7c..d5ca3ccc4b 100644
--- a/src/user/delete.js
+++ b/src/user/delete.js
@@ -151,6 +151,7 @@ module.exports = function (User) {
 			deleteImages(uid),
 			groups.leaveAllGroups(uid),
 			flags.resolveFlag('user', uid, uid),
+			User.reset.cleanByUid(uid),
 		]);
 		await db.deleteAll(['followers:' + uid, 'following:' + uid, 'user:' + uid]);
 		delete deletesInProgress[uid];