Fix multi-tenant user creation, migration safety, and setup stability for Macbook
