Added DEFAULT_FROM_EMAIL