diff --git a/users.js b/users.js
index 1c6a5831f0..9d8d94aa7b 100644
--- a/users.js
+++ b/users.js
@@ -1032,9 +1032,11 @@ function unlock(name, unlocked, noRecurse) {
 	var userips = null;
 	if (user) {
 		if (user.userid === userid) name = user.name;
-		user.locked = false;
-		unlocked = unlocked || {};
-		unlocked[name] = 1;
+		if (user.locked) {
+			user.locked = false;
+			unlocked = unlocked || {};
+			unlocked[name] = 1;
+		}
 		if (!noRecurse) userips = user.ips;
 	}
 	for (var ip in lockedIps) {