Fix issue if mail is empty or not set