Merge pull request #1784 from nabinhait/v4-hotfix

Minor fixes in salary manager. Fixes #1754