Fix for empty mail id