fix invalid email on client import
Merge branch 'dont_overwrite_owner_on_import'