Fix new user email issue