xbt_client_whitelist + Super Priveleges fix

Thanks JDVU for feedback