Minor refactor on email generation for email change confirmation