diff --git a/cockatrice/src/tab_supervisor.cpp b/cockatrice/src/tab_supervisor.cpp
index f2b6046db..cbeb3aa74 100644
--- a/cockatrice/src/tab_supervisor.cpp
+++ b/cockatrice/src/tab_supervisor.cpp
@@ -454,14 +454,11 @@ void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event)
 
     if (twi)
         sendingUser = twi->getUserInfo();
+        if (settingsCache->getIgnoreUnregisteredUsers())
+            return;
     else
         sendingUser.set_name(senderName.toStdString());
 
-    UserLevelFlags sendingUserLevel = UserLevelFlags(sendingUser.user_level());
-
-    if (settingsCache->getIgnoreUnregisteredUsers() && (!sendingUserLevel.testFlag(ServerInfo_User::IsUser) || !sendingUserLevel.testFlag(ServerInfo_User::IsRegistered) || !sendingUserLevel.testFlag(ServerInfo_User::IsModerator) || !sendingUserLevel.testFlag(ServerInfo_User::IsAdmin)))
-        return;
-
 TabMessage *tab = messageTabs.value(senderName);
     if (!tab)
         tab = messageTabs.value(QString::fromStdString(event.receiver_name()));