diff --git a/Bot/Whitelist.fs b/Bot/Whitelist.fs
index 6d98e51..4442603 100644
--- a/Bot/Whitelist.fs
+++ b/Bot/Whitelist.fs
@@ -44,7 +44,13 @@ You need to **BUY** Whitelist with 💰 $GBT...
 
 let grantWhitelistRole isOg (ctx : IDiscordContext) =
     task {
-        let roleId = if isOg then GuildEnvironment.roleWhiteOGPending else GuildEnvironment.roleWhitelistPending
+        let! wallet = InviteTracker.getWalletAddress (ctx.GetDiscordMember().Id)
+        let roleId =
+            match isOg , wallet with
+            | true  , Some _ -> GuildEnvironment.roleWhiteOG
+            | false , Some _ -> GuildEnvironment.roleWhitelist
+            | true  , None   -> GuildEnvironment.roleWhiteOGPending
+            | false , None   -> GuildEnvironment.roleWhitelistPending
         let role = ctx.GetGuild().GetRole(roleId)
         let user = ctx.GetDiscordMember()
         do! user.GrantRoleAsync(role)