Feature/fix catch all emails