Merge "Fix issue where auth wouldn't be triggered"