Email required logic fix