Fixed bug with #1113: email field null throws error