diff --git a/plugins/relay.py b/plugins/relay.py
index 9b74ee1..b5f2339 100644
--- a/plugins/relay.py
+++ b/plugins/relay.py
@@ -157,7 +157,7 @@ def normalize_nick(irc, netname, nick, times_tagged=0, uid=''):
         if char not in allowed_chars:
             nick = nick.replace(char, fallback_separator)
 
-    while irc.nickToUid(nick) and irc.nickToUid(nick) != uid:
+    while irc.nickToUid(nick) not in (None, uid):
         # The nick we want exists: Increase the separator length by 1 if the user was already
         # tagged, but couldn't be created due to a nick conflict. This can happen when someone
         # steals a relay user's nick.