diff --git a/src/main/java/com/hypherionmc/sdlink/core/accounts/MinecraftAccount.java b/src/main/java/com/hypherionmc/sdlink/core/accounts/MinecraftAccount.java
index 0b8a357..53905c3 100644
--- a/src/main/java/com/hypherionmc/sdlink/core/accounts/MinecraftAccount.java
+++ b/src/main/java/com/hypherionmc/sdlink/core/accounts/MinecraftAccount.java
@@ -317,11 +317,15 @@ public class MinecraftAccount {
 
             if (discordUser != null) {
                 Member m = BotController.INSTANCE.getJDA().getGuilds().get(0).getMemberById(discordUser.getId());
-                return m != null && m.getRoles().stream().anyMatch(r -> RoleManager.getAutoWhitelistRoles().contains(r));
+
+                if (m == null)
+                    return false;
+
+                return m.getRoles().stream().anyMatch(r -> RoleManager.getAutoWhitelistRoles().contains(r));
             }
         }
 
-        return false;
+        return !SDLinkConfig.INSTANCE.whitelistingAndLinking.accountLinking.accountLinking;
     }
 
     /**