Shifting whitelist and logout error logic