Adjustments to getEmailServicesAddress