Merge "Update Active Group before creating AuthClient"