Authentication Token fixes