Fix some issues with import of users