Fixes on vendors mail