Switch to IP-address check instead of tokens