minor improvement in requiring whitelisted user