Bugfix + add actual send switch to avoid sending emails in dev. context