Do not overwrite user's email, unless it's empty
(cherry picked from commit 88f6ee7c893bf509527df6c965e495c0d145c60c)