LILY-507: make Type required & case should be assignable to Contact without Account
Hotfix: add tenantmanager