Re-work token authentication to resolve IE errors