Merge pull request #2001 from nabinhait/hotfix

Validation: Account must belong to the same company