Emails Endpoint Corrections