diff --git a/users.js b/users.js
index 777e989543..4581d3abb9 100644
--- a/users.js
+++ b/users.js
@@ -792,6 +792,10 @@ class User {
 			}
 			if (this.named) user.prevNames[this.userid] = this.name;
 			this.destroy();
+
+			if (user.named) Punishments.checkName(user, registered);
+			if (user.namelocked) user.named = true;
+
 			Rooms.global.checkAutojoin(user);
 			if (Config.loginfilter) Config.loginfilter(user, this, userType);
 			return true;