Fix indentation
Do not overwrite user's email, unless it's empty