Merge pull request #1902 from nabinhait/hotfix

Run trigger of company field on onload function, even if company exists