Addition of extra condition to check empty emails