Fixed: Sending duplicate emails. Closes #972