Changing how the plugin check if it should resolve tenant before login