[Fix] Email null issues