Improve email-in-use flow