Refactor new AuthEvents