Stop setting email explicitly - caused conflicts