diff --git a/irc/client_lookup_set.go b/irc/client_lookup_set.go
index 387a357a..74bfb318 100644
--- a/irc/client_lookup_set.go
+++ b/irc/client_lookup_set.go
@@ -129,7 +129,7 @@ func (clients *ClientManager) SetNick(client *Client, newNick string) error {
 	if currentNewEntry != nil && currentNewEntry != client {
 		return errNicknameInUse
 	}
-	if method == NickReservationStrict && reservedAccount != client.Account() {
+	if method == NickReservationStrict && reservedAccount != "" && reservedAccount != client.Account() {
 		return errNicknameReserved
 	}
 	clients.removeInternal(client)