Added precaution around user email