Fix the empty user email issue