Fix #118, merging the Require Email and Show Email