Fix bug saving email addresses