Fix migrate of users and companies