diff --git a/src/core/servers.c b/src/core/servers.c
index ef43e4f6..92a6e5ac 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -126,7 +126,7 @@ static char *server_create_tag(SERVER_CONNECT_REC *conn)
 	str = g_string_new(tag);
 
 	num = 2;
-	while (server_find_tag(str->str) != NULL &&
+	while (server_find_tag(str->str) != NULL ||
 	       server_find_lookup_tag(str->str) != NULL) {
 		g_string_sprintf(str, "%s%d", tag, num);
 		num++;