Basvi-Bug Fixes

Generete forms crashes in company case(3560)