Better idempotentcy and basic email configuration