Fixed multiple email problems