Move events for login to better locations