Fixes in data import and login