Re: Supporting both "username" to username@domain.com