Added missing old email validation