Email field fix