Mail check changed from front-end to back-end