Fix: Bad merge
Fix: Avoid duplicate emails