Fix hidden name and google email
Refactor to use events